From b0a4c940130d055a9bea8c7705feeaec318a8789 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Sat, 15 Oct 2022 21:33:32 -0700 Subject: 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: I021c7562dc950f6b164760573d25a95022288ca0 --- .../com/android/providers/contacts/SynchronousContactsProvider2.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/src/com/android/providers/contacts/SynchronousContactsProvider2.java b/tests/src/com/android/providers/contacts/SynchronousContactsProvider2.java index c2ab74fc..848c2379 100644 --- a/tests/src/com/android/providers/contacts/SynchronousContactsProvider2.java +++ b/tests/src/com/android/providers/contacts/SynchronousContactsProvider2.java @@ -32,7 +32,8 @@ import java.util.Locale; public class SynchronousContactsProvider2 extends ContactsProvider2 { public static final String READ_ONLY_ACCOUNT_TYPE = "ro"; - private static Boolean sDataWiped = false; + private static final Object sDataWipedLock = new Object(); + private static boolean sDataWiped = false; private static ContactsDatabaseHelper sDbHelper; private Account mAccount; private boolean mNetworkNotified; @@ -93,7 +94,7 @@ public class SynchronousContactsProvider2 extends ContactsProvider2 { @Override public boolean onCreate() { boolean created = super.onCreate(); - synchronized (sDataWiped) { + synchronized (sDataWipedLock) { if (!sDataWiped) { sDataWiped = true; wipeData(); -- cgit v1.2.3