fazilsheik
/
android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix errorprone warnings that should be errors 

This commit is part of a large scale change to fix errorprone
errors that have been downgraded to warnings in the android
source tree, so that they can be promoted to errors again.
The full list of changes include the following, but not all
will be present in any one individual commit:

BadAnnotationImplementation
BadShiftAmount
BanJNDI
BoxedPrimitiveEquality
ComparableType
ComplexBooleanConstant
CollectionToArraySafeParameter
ConditionalExpressionNumericPromotion
DangerousLiteralNull
DoubleBraceInitialization
DurationFrom
DurationTemporalUnit
EmptyTopLevelDeclaration
EqualsNull
EqualsReference
FormatString
FromTemporalAccessor
GetClassOnAnnotation
GetClassOnClass
HashtableContains
IdentityBinaryExpression
IdentityHashMapBoxing
InstantTemporalUnit
InvalidTimeZoneID
InvalidZoneId
IsInstanceIncompatibleType
JUnitParameterMethodNotFound
LockOnBoxedPrimitive
MathRoundIntLong
MislabeledAndroidString
MisusedDayOfYear
MissingSuperCall
MisusedWeekYear
ModifyingCollectionWithItself
NoCanIgnoreReturnValueOnClasses
NonRuntimeAnnotation
NullableOnContainingClass
NullTernary
OverridesJavaxInjectableMethod
ParcelableCreator
PeriodFrom
PreconditionsInvalidPlaceholder
ProtoBuilderReturnValueIgnored
ProtoFieldNullComparison
RandomModInteger
RectIntersectReturnValueIgnored
ReturnValueIgnored
SelfAssignment
SelfComparison
SelfEquals
SizeGreaterThanOrEqualsZero
StringBuilderInitWithChar
TreeToString
TryFailThrowable
UnnecessaryCheckNotNull
UnusedCollectionModifiedInPlace
XorPower

See https://errorprone.info/bugpatterns for more
information on the checks.

Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I7625fa386afe93823b97cb2ecb8fd09a5856c05b

Former-commit-id: 22f05839f5
This commit is contained in:
Cole Faust 2022-10-15 21:33:30 -07:00
parent 799ca6bd74
commit 0e5057e106
7 changed files with 110 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tethering/src/com/android/networkstack/tethering/metrics/TetheringMetrics.java
View File

@ -76,8 +76,7 @@ public class TetheringMetrics {
.setUpstreamType(UpstreamType.UT_UNKNOWN)
.setErrorCode(ErrorCode.EC_NO_ERROR)
.setUpstreamEvents(UpstreamEvents.newBuilder())
.setDurationMillis(0)
.build();
.setDurationMillis(0);
mBuilderMap.put(downstreamType, statsBuilder);
}

2
Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
View File

@ -76,7 +76,7 @@ import android.net.TetheringManager.StartTetheringCallback;
import android.net.TetheringManager.TetheringEventCallback;
import android.net.TetheringManager.TetheringRequest;
import android.net.TetheringTester.TetheredDevice;
import android.net.cts.util.CtsNetUtils;;
import android.net.cts.util.CtsNetUtils;
import android.os.Build;
import android.os.Handler;
import android.os.HandlerThread;

13
Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java
View File

@ -138,6 +138,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
@RunWith(AndroidJUnit4.class)
@SmallTest
@ -195,13 +196,11 @@ public class BpfCoordinatorTest {
UPSTREAM_IFACE2, UPSTREAM_IFINDEX2, MacAddress.fromString("44:55:66:00:00:0c"),
NetworkStackConstants.ETHER_MTU);
private static final HashMap<Integer, UpstreamInformation> UPSTREAM_INFORMATIONS =
new HashMap<Integer, UpstreamInformation>() {{
put(UPSTREAM_IFINDEX, new UpstreamInformation(UPSTREAM_IFACE_PARAMS,
PUBLIC_ADDR, NetworkCapabilities.TRANSPORT_CELLULAR, TEST_NET_ID));
put(UPSTREAM_IFINDEX2, new UpstreamInformation(UPSTREAM_IFACE_PARAMS2,
PUBLIC_ADDR2, NetworkCapabilities.TRANSPORT_WIFI, TEST_NET_ID2));
}};
private static final Map<Integer, UpstreamInformation> UPSTREAM_INFORMATIONS = Map.of(
UPSTREAM_IFINDEX, new UpstreamInformation(UPSTREAM_IFACE_PARAMS,
PUBLIC_ADDR, NetworkCapabilities.TRANSPORT_CELLULAR, TEST_NET_ID),
UPSTREAM_IFINDEX2, new UpstreamInformation(UPSTREAM_IFACE_PARAMS2,
PUBLIC_ADDR2, NetworkCapabilities.TRANSPORT_WIFI, TEST_NET_ID2));
private static final ClientInfo CLIENT_INFO_A = new ClientInfo(DOWNSTREAM_IFINDEX,
DOWNSTREAM_MAC, PRIVATE_ADDR, MAC_A);

2
common/src/com/android/net/module/util/bpf/Tether4Key.java
View File

@ -75,7 +75,7 @@ public class Tether4Key extends Struct {
Inet4Address.getByAddress(src4), Inet4Address.getByAddress(dst4),
Short.toUnsignedInt((short) srcPort), Short.toUnsignedInt((short) dstPort));
} catch (UnknownHostException | IllegalArgumentException e) {
return String.format("Invalid IP address", e);
return "Invalid IP address" + e;
}
}
}

2
common/src/com/android/net/module/util/bpf/Tether4Value.java
View File

@ -91,7 +91,7 @@ public class Tether4Value extends Struct {
Short.toUnsignedInt((short) srcPort), Short.toUnsignedInt((short) dstPort),
lastUsed);
} catch (UnknownHostException | IllegalArgumentException e) {
return String.format("Invalid IP address", e);
return "Invalid IP address" + e;
}
}
}

2
framework-t/src/android/net/IpSecAlgorithm.java
View File

@ -488,4 +488,4 @@ public final class IpSecAlgorithm implements Parcelable {
&& Arrays.equals(lhs.mKey, rhs.mKey)
&& lhs.mTruncLenBits == rhs.mTruncLenBits);
}
};
}

161
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@ -2689,7 +2689,7 @@ public class ConnectivityServiceTest {
final TestNetworkCallback generalCb = new TestNetworkCallback();
final TestNetworkCallback defaultCb = new TestNetworkCallback();
mCm.registerNetworkCallback(
new NetworkRequest.Builder().addTransportType(transport | transport).build(),
new NetworkRequest.Builder().addTransportType(transport).build(),
generalCb);
mCm.registerDefaultNetworkCallback(defaultCb);
@ -4755,6 +4755,81 @@ public class ConnectivityServiceTest {
return new NetworkRequest.Builder().addTransportType(TRANSPORT_WIFI);
}
// A NetworkSpecifier subclass that matches all networks but must not be visible to apps.
static class ConfidentialMatchAllNetworkSpecifier extends NetworkSpecifier implements
Parcelable {
public static final Parcelable.Creator<ConfidentialMatchAllNetworkSpecifier> CREATOR =
new Parcelable.Creator<ConfidentialMatchAllNetworkSpecifier>() {
public ConfidentialMatchAllNetworkSpecifier createFromParcel(Parcel in) {
return new ConfidentialMatchAllNetworkSpecifier();
}
public ConfidentialMatchAllNetworkSpecifier[] newArray(int size) {
return new ConfidentialMatchAllNetworkSpecifier[size];
}
};
@Override
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
return true;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {}
@Override
public NetworkSpecifier redact() {
return null;
}
}
// A network specifier that matches either another LocalNetworkSpecifier with the same
// string or a ConfidentialMatchAllNetworkSpecifier, and can be passed to apps as is.
static class LocalStringNetworkSpecifier extends NetworkSpecifier implements Parcelable {
public static final Parcelable.Creator<LocalStringNetworkSpecifier> CREATOR =
new Parcelable.Creator<LocalStringNetworkSpecifier>() {
public LocalStringNetworkSpecifier createFromParcel(Parcel in) {
return new LocalStringNetworkSpecifier(in);
}
public LocalStringNetworkSpecifier[] newArray(int size) {
return new LocalStringNetworkSpecifier[size];
}
};
private String mString;
LocalStringNetworkSpecifier(String string) {
mString = string;
}
LocalStringNetworkSpecifier(Parcel in) {
mString = in.readString();
}
@Override
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
if (other instanceof LocalStringNetworkSpecifier) {
return TextUtils.equals(mString,
((LocalStringNetworkSpecifier) other).mString);
}
if (other instanceof ConfidentialMatchAllNetworkSpecifier) return true;
return false;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(mString);
}
}
/**
* Verify request matching behavior with network specifiers.
*
@ -4764,56 +4839,6 @@ public class ConnectivityServiceTest {
*/
@Test
public void testNetworkSpecifier() throws Exception {
// A NetworkSpecifier subclass that matches all networks but must not be visible to apps.
class ConfidentialMatchAllNetworkSpecifier extends NetworkSpecifier implements
Parcelable {
@Override
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
return true;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {}
@Override
public NetworkSpecifier redact() {
return null;
}
}
// A network specifier that matches either another LocalNetworkSpecifier with the same
// string or a ConfidentialMatchAllNetworkSpecifier, and can be passed to apps as is.
class LocalStringNetworkSpecifier extends NetworkSpecifier implements Parcelable {
private String mString;
LocalStringNetworkSpecifier(String string) {
mString = string;
}
@Override
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
if (other instanceof LocalStringNetworkSpecifier) {
return TextUtils.equals(mString,
((LocalStringNetworkSpecifier) other).mString);
}
if (other instanceof ConfidentialMatchAllNetworkSpecifier) return true;
return false;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {}
}
NetworkRequest rEmpty1 = newWifiRequestBuilder().build();
NetworkRequest rEmpty2 = newWifiRequestBuilder().setNetworkSpecifier((String) null).build();
NetworkRequest rEmpty3 = newWifiRequestBuilder().setNetworkSpecifier("").build();
@ -4897,6 +4922,29 @@ public class ConnectivityServiceTest {
return mContext.getAttributionTag();
}
static class NonParcelableSpecifier extends NetworkSpecifier {
@Override
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
return false;
}
}
static class ParcelableSpecifier extends NonParcelableSpecifier implements Parcelable {
public static final Parcelable.Creator<NonParcelableSpecifier> CREATOR =
new Parcelable.Creator<NonParcelableSpecifier>() {
public NonParcelableSpecifier createFromParcel(Parcel in) {
return new NonParcelableSpecifier();
}
public NonParcelableSpecifier[] newArray(int size) {
return new NonParcelableSpecifier[size];
}
};
@Override public int describeContents() {
return 0;
}
@Override public void writeToParcel(Parcel p, int flags) {}
}
@Test
public void testInvalidNetworkSpecifier() {
assertThrows(IllegalArgumentException.class, () -> {
@ -4914,17 +4962,6 @@ public class ConnectivityServiceTest {
mContext.getPackageName(), getAttributionTag());
});
class NonParcelableSpecifier extends NetworkSpecifier {
@Override
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
return false;
}
};
class ParcelableSpecifier extends NonParcelableSpecifier implements Parcelable {
@Override public int describeContents() { return 0; }
@Override public void writeToParcel(Parcel p, int flags) {}
}
final NetworkRequest.Builder builder =
new NetworkRequest.Builder().addTransportType(TRANSPORT_ETHERNET);
assertThrows(ClassCastException.class, () -> {