Fix issue with pin prompt.
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:
@@ -54,7 +54,6 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
|
||||
// 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 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
|
||||
if (!mChallengeRequested) {
|
||||
mChallengeSucceeded = false;
|
||||
mChallengeRequested = false;
|
||||
mScreenToggledOff = true;
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -93,19 +91,11 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
|
||||
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,13 +111,11 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
if (mScreenToggledOff) {
|
||||
mScreenToggledOff = false;
|
||||
|
||||
if (shouldBeProviderProtected(mRestrictionKey)) {
|
||||
ensurePin();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
|
Reference in New Issue
Block a user