PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue with pin prompt.

Browse Source 
The PIN prompt would reappear if the pin screen had been rotated 90
degrees before a user hit cancel/ok.

Change-Id: Ia5f93aa7a857d46ba95775c85344fa9ff28a4a6b
This commit is contained in:
Julia Reynolds
2014-07-29 09:50:04 -04:00
parent c8a1db1912
commit d6e493f649
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/RestrictedSettingsFragment.java
View File

@@ -54,7 +54,6 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
// If the restriction PIN is entered correctly. // If the restriction PIN is entered correctly.
private boolean mChallengeSucceeded; private boolean mChallengeSucceeded;
private boolean mChallengeRequested; private boolean mChallengeRequested;
private boolean mScreenToggledOff;
private UserManager mUserManager; private UserManager mUserManager;
private RestrictionsManager mRestrictionsManager; private RestrictionsManager mRestrictionsManager;
@@ -68,7 +67,6 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
if (!mChallengeRequested) { if (!mChallengeRequested) {
mChallengeSucceeded = false; mChallengeSucceeded = false;
mChallengeRequested = false; mChallengeRequested = false;
mScreenToggledOff = true;
} }
} }
}; };
@@ -93,19 +91,11 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
if (icicle != null) { if (icicle != null) {
mChallengeSucceeded = icicle.getBoolean(KEY_CHALLENGE_SUCCEEDED, false); mChallengeSucceeded = icicle.getBoolean(KEY_CHALLENGE_SUCCEEDED, false);
mChallengeRequested = icicle.getBoolean(KEY_CHALLENGE_REQUESTED, false); mChallengeRequested = icicle.getBoolean(KEY_CHALLENGE_REQUESTED, false);
} else {
mChallengeSucceeded = false;
mChallengeRequested = false;
} }
mScreenToggledOff = false;
IntentFilter offFilter = new IntentFilter(Intent.ACTION_SCREEN_OFF); IntentFilter offFilter = new IntentFilter(Intent.ACTION_SCREEN_OFF);
offFilter.addAction(Intent.ACTION_USER_PRESENT); offFilter.addAction(Intent.ACTION_USER_PRESENT);
getActivity().registerReceiver(mScreenOffReceiver, offFilter); getActivity().registerReceiver(mScreenOffReceiver, offFilter);
if (shouldBeProviderProtected(mRestrictionKey)) {
ensurePin();
}
} }
@Override @Override
@@ -121,11 +111,9 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
if (mScreenToggledOff) {
mScreenToggledOff = false; if (shouldBeProviderProtected(mRestrictionKey)) {
if(shouldBeProviderProtected(mRestrictionKey)) { ensurePin();
ensurePin();
}
} }
} }