commit 20043f40fc29f46af1b2ea2f09aebcf7c62f4772
author Amith Yamasani <yamasani@google.com> Thu Jan 07 19:05:07 2010 -0800
committer Amith Yamasani <yamasani@google.com> Tue Jan 12 14:55:16 2010 -0800
tree 8f766ce5da6b93f87f2ab87ecf32becb1eaf9c23
parent 04e32ff35fe60cdd62509cff1df24d62cd464f4e

Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE

Backport from froyo.

If the monkey is running, exit the SIM lock settings activity.

src/com/android/settings/IccLockSettings.java

diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 3a7a708..6494567 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -119,6 +119,11 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        if (Utils.isMonkeyRunning()) {
+            finish();
+            return;
+        }
+
         addPreferencesFromResource(R.xml.sim_lock_settings);
 
         mPinDialog = (EditPinPreference) findPreference(PIN_DIALOG);