commit | 9a18b32ced39eaf1aa8a24381b08ce409478878d | [log] [tgz] |
---|---|---|
author | Dmitri Plotnikov <dplotnikov@google.com> | Wed Jun 23 21:08:42 2010 -0700 |
committer | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | Thu Jun 24 12:29:27 2010 -0700 |
tree | 14f7bb3fe7aa5212e98f228864a653ffab52563c | |
parent | 138b351e7d83171808261511a2c4c0e67d0bc187 [diff] |
Avoiding a race condition caused by configuration change during FroYo upgrade Bug: 2789091 Change-Id: I8515521eeea83e11c9b14eface70e3f86bf51974
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index 76e30ee..f4a4c5a 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -2027,6 +2027,10 @@ @Override public void onConfigurationChanged(Configuration newConfig) { + if (mProviderStatus != ProviderStatus.STATUS_NORMAL) { + return; + } + initForDefaultLocale(); verifyLocale(); }