am d8d21279: Merge "Don\'t allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE" into eclair

Merge commit 'd8d2127936faac93806e5a64447cee0fd8dd2d62' into eclair-plus-aosp

* commit 'd8d2127936faac93806e5a64447cee0fd8dd2d62':
  Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE
This commit is contained in:
Amith Yamasani
2010-01-12 16:12:28 -08:00
committed by Android Git Automerger

View File

@@ -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);