Fix when turn off "Ask for PIN before unpinning" we don't check the result of ChooseLockSettings
Change-Id: I812a07b704022c5d4147c57410e8d3230fb26cdb Fixes: 290181459 Test: manual verify
This commit is contained in:
@@ -15,6 +15,8 @@
|
|||||||
*/
|
*/
|
||||||
package com.android.settings.security;
|
package com.android.settings.security;
|
||||||
|
|
||||||
|
import static android.app.Activity.RESULT_OK;
|
||||||
|
|
||||||
import android.app.admin.DevicePolicyManager;
|
import android.app.admin.DevicePolicyManager;
|
||||||
import android.app.settings.SettingsEnums;
|
import android.app.settings.SettingsEnums;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
@@ -167,7 +169,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
|
|||||||
setScreenLockUsed(validPassQuality);
|
setScreenLockUsed(validPassQuality);
|
||||||
// Make sure the screen updates.
|
// Make sure the screen updates.
|
||||||
mUseScreenLock.setChecked(validPassQuality);
|
mUseScreenLock.setChecked(validPassQuality);
|
||||||
} else if (requestCode == CONFIRM_REQUEST) {
|
} else if (requestCode == CONFIRM_REQUEST && resultCode == RESULT_OK) {
|
||||||
setScreenLockUsedSetting(false);
|
setScreenLockUsedSetting(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user