Merge "Snap for 9199219 from 70df3ac6bcbf72f1280470c1dbc90dbe2d7bfb2a to gki13-boot-release" into gki13-boot-releasegki13-boot-release

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();