Avoiding a race condition caused by configuration change during FroYo upgradeandroid-sdk-tools_r7android-cts-2.2_r8android-cts-2.2_r7android-cts-2.2_r6android-cts-2.2_r5android-cts-2.2_r4android-cts-2.2_r3android-cts-2.2_r2android-cts-2.2_r1android-adt-0.9.9android-adt-0.9.8tools_r9tools_r8tools_r7froyo-plus-aospfroyo

Bug: 2789091
Change-Id: I8515521eeea83e11c9b14eface70e3f86bf51974

1 files changed, 4 insertions, 0 deletions

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 76e30ee0..f4a4c5a4 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -2027,6 +2027,10 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
+        if (mProviderStatus != ProviderStatus.STATUS_NORMAL) {
+            return;
+        }
+
         initForDefaultLocale();
         verifyLocale();
     }