diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-01-12 16:10:17 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-12 16:10:17 -0800 |
| commit | d8d2127936faac93806e5a64447cee0fd8dd2d62 (patch) | |
| tree | 9486d7711cb5267409c43101e33a3f3c161ef651 /src | |
| parent | c5aa68f3f2201227e85e52ee33937e70e7741c3c (diff) | |
| parent | 20043f40fc29f46af1b2ea2f09aebcf7c62f4772 (diff) | |
| download | packages_apps_settings-d8d2127936faac93806e5a64447cee0fd8dd2d62.zip packages_apps_settings-d8d2127936faac93806e5a64447cee0fd8dd2d62.tar.gz packages_apps_settings-d8d2127936faac93806e5a64447cee0fd8dd2d62.tar.bz2 | |
Merge "Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE" into eclair
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/IccLockSettings.java | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ public class IccLockSettings extends PreferenceActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + if (Utils.isMonkeyRunning()) { + finish(); + return; + } + addPreferencesFromResource(R.xml.sim_lock_settings); mPinDialog = (EditPinPreference) findPreference(PIN_DIALOG); |