diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-20 01:58:44 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-10-20 01:58:44 +0000 |
commit | 1c2fb58548a854843163ad68b0c9479550b6b22d (patch) | |
tree | d944ae6713762aef01b0a68316c778b44580e720 | |
parent | 1bb24bd921d231dc381d1116e71218daaed83706 (diff) | |
parent | 9a7e0f7b5388d96e0f01290e1c0beeed7c929a4c (diff) | |
download | ContactsProvider-main-16k.tar.gz |
Merge "Merge "Fix errorprone warnings that should be errors" am: 70df3ac6bc" into main-16kmain-16k
-rw-r--r-- | tests/src/com/android/providers/contacts/SynchronousContactsProvider2.java | 5 |
1 files 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(); |