commit 9bd889d7fbad483471e0a4d26f05d2e68b67a2e4
author Eric Fischer <enf@google.com> Fri Jan 08 13:11:18 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 08 13:11:18 2010 -0800
tree cf8037d94d207d290d87f6b5cd41753104f40544
parent db149c616f5f020a33aeba0b70b82641b7db98b2
parent da44d9f64af74790604d4ec97c94aa45cfc2257f

Merge "Change the "Brasilia" time zone to follow America/Sao_Paulo DST rules."

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