commit a71d7056503121fea26ce58fa8996871b4b10d25
author Julia Reynolds <juliacr@google.com> Wed Jul 30 20:50:14 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 25 23:00:08 2014 +0000
tree d443ad9ada445c4827e3ee5fb479dff59a5c8f89
parent fe1b8950bc02d96f2675505ee0aa95146831465b
parent d6e493f6499c3be4a0a5af14eb433dec2ab725d3

Merge "Fix issue with pin prompt." into lmp-dev

src/com/android/settings/RestrictedSettingsFragment.java

diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java
index 8e88b30..142a42c 100644
--- a/src/com/android/settings/RestrictedSettingsFragment.java
+++ b/src/com/android/settings/RestrictedSettingsFragment.java
@@ -54,7 +54,6 @@
     // If the restriction PIN is entered correctly.
     private boolean mChallengeSucceeded;
     private boolean mChallengeRequested;
-    private boolean mScreenToggledOff;
 
     private UserManager mUserManager;
     private RestrictionsManager mRestrictionsManager;
@@ -68,7 +67,6 @@
             if (!mChallengeRequested) {
                 mChallengeSucceeded = false;
                 mChallengeRequested = false;
-                mScreenToggledOff = true;
             }
         }
     };
@@ -93,19 +91,11 @@
         if (icicle != null) {
             mChallengeSucceeded = icicle.getBoolean(KEY_CHALLENGE_SUCCEEDED, false);
             mChallengeRequested = icicle.getBoolean(KEY_CHALLENGE_REQUESTED, false);
-        } else {
-            mChallengeSucceeded = false;
-            mChallengeRequested = false;
         }
-        mScreenToggledOff = false;
 
         IntentFilter offFilter = new IntentFilter(Intent.ACTION_SCREEN_OFF);
         offFilter.addAction(Intent.ACTION_USER_PRESENT);
         getActivity().registerReceiver(mScreenOffReceiver, offFilter);
-
-        if (shouldBeProviderProtected(mRestrictionKey)) {
-            ensurePin();
-        }
     }
 
     @Override
@@ -121,11 +111,9 @@
     @Override
     public void onResume() {
         super.onResume();
-        if (mScreenToggledOff) {
-            mScreenToggledOff = false;
-            if(shouldBeProviderProtected(mRestrictionKey)) {
-                ensurePin();
-            }
+
+        if (shouldBeProviderProtected(mRestrictionKey)) {
+            ensurePin();
         }
     }