Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 213c35c0 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am d8d21279: Merge "Don\'t allow monkey to play with SIM lock settings. Bug #... 

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

Merge commit 'd8d21279' into eclair-plus-aosp

* commit 'd8d21279':
  Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE
parents d69a5ee2 d8d21279

src/com/android/settings/IccLockSettings.java

+5 −0
Original line number Diff line number Diff line
@@ -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);