Merge change I7fa8c508 into eclair-mr2

* changes: make erase-password-on-SIM-change optional
2009-10-13 17:26:48 -04:00
parent 770d5c4f00 7fa8c508e0
commit b5b6777903
1 changed files with 5 additions and 1 deletions
--- a/core/java/android/accounts/AccountManagerService.java
+++ b/core/java/android/accounts/AccountManagerService.java
@@ -223,7 +223,11 @@ public class AccountManagerService
        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();