commit b5b6777903d85349cf4baa07a54e1629551ea712
author Android (Google) Code Review <android-gerrit@google.com> Tue Oct 13 17:26:48 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 13 17:26:48 2009 -0400
tree 664928b934bc3c36dddc6095bfc26e85fc825988
parent 770d5c4f0093a65d20b22f14082911697f9f9b9e
parent 7fa8c508e0ebc8d8190fa8860d1f3bab819df081

Merge change I7fa8c508 into eclair-mr2

* changes:
  make erase-password-on-SIM-change optional

core/java/android/accounts/AccountManagerService.java

diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java
index 3a11cb3..da19d67 100644
--- a/core/java/android/accounts/AccountManagerService.java
+++ b/core/java/android/accounts/AccountManagerService.java
@@ -223,7 +223,11 @@
         mBindHelper = new AuthenticatorBindHelper(mContext, mAuthenticatorCache, mMessageHandler,
                 MESSAGE_CONNECTED, MESSAGE_DISCONNECTED);
 
-        mSimWatcher = new SimWatcher(mContext);
+        if (SystemProperties.getBoolean("ro.config.sim_password_clear", false)) {
+          mSimWatcher = new SimWatcher(mContext);
+        } else {
+          mSimWatcher = null;
+        }
         sThis.set(this);
 
         onRegisteredServicesCacheChanged();