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: I424f7ac9b720aa2e751186565a2bf8617e26541e
diff --git a/src/com/android/nn/benchmark/core/BenchmarkException.java b/src/com/android/nn/benchmark/core/BenchmarkException.java
index a4383dd..2149b5e 100644
--- a/src/com/android/nn/benchmark/core/BenchmarkException.java
+++ b/src/com/android/nn/benchmark/core/BenchmarkException.java
@@ -20,4 +20,4 @@
public BenchmarkException(String message) {
super(message);
}
-};
+}
diff --git a/src/com/android/nn/benchmark/core/NNTestBase.java b/src/com/android/nn/benchmark/core/NNTestBase.java
index e5ab9ea..6ad84b8 100644
--- a/src/com/android/nn/benchmark/core/NNTestBase.java
+++ b/src/com/android/nn/benchmark/core/NNTestBase.java
@@ -237,12 +237,10 @@
mContext = ipcxt;
long nnApiLibHandle = 0;
if (mUseNnApiSupportLibrary) {
- HashMap<String, Supplier<SupportLibraryDriverHandler>> vendors =
- new HashMap<String, Supplier<SupportLibraryDriverHandler>>() {{
- put("qc", () -> new QualcommSupportLibraryDriverHandler());
- put("arm", () -> new ArmSupportLibraryDriverHandler());
- put("mtk", () -> new MediaTekSupportLibraryDriverHandler());
- }};
+ HashMap<String, Supplier<SupportLibraryDriverHandler>> vendors = new HashMap<>();
+ vendors.put("qc", () -> new QualcommSupportLibraryDriverHandler());
+ vendors.put("arm", () -> new ArmSupportLibraryDriverHandler());
+ vendors.put("mtk", () -> new MediaTekSupportLibraryDriverHandler());
Supplier<SupportLibraryDriverHandler> vendor = vendors.get(mNnApiSupportLibraryVendor);
if (vendor == null) {
throw new NnApiDelegationFailure(String
diff --git a/src/com/android/nn/benchmark/core/UnsupportedSdkException.java b/src/com/android/nn/benchmark/core/UnsupportedSdkException.java
index f232ee2..350431b 100644
--- a/src/com/android/nn/benchmark/core/UnsupportedSdkException.java
+++ b/src/com/android/nn/benchmark/core/UnsupportedSdkException.java
@@ -20,4 +20,4 @@
public UnsupportedSdkException(String message) {
super(message);
}
-};
+}
