Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev

Browse Source 
* commit '4ef9edeb67a1aa25b4ec57b9951b8dc4a06c3691':
  Handle policy change while keyguard disabled
This commit is contained in:
Jason Monk
2014-12-10 21:11:30 +00:00
committed by Android Git Automerger
parent ed211b940b 4ef9edeb67
commit 65c08ec82a
1 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
services/core/java/com/android/server/wm/KeyguardDisableHandler.java
View File

@@ -68,9 +68,18 @@ public class KeyguardDisableHandler extends Handler {
break; break;
case KEYGUARD_POLICY_CHANGED: case KEYGUARD_POLICY_CHANGED:
mPolicy.enableKeyguard(true);
// lazily evaluate this next time we're asked to disable keyguard
mAllowDisableKeyguard = ALLOW_DISABLE_UNKNOWN; mAllowDisableKeyguard = ALLOW_DISABLE_UNKNOWN;
if (mKeyguardTokenWatcher.isAcquired()) {
// If we are currently disabled we need to know if the keyguard
// should be re-enabled, so determine the allow state immediately.
mKeyguardTokenWatcher.updateAllowState();
if (mAllowDisableKeyguard != ALLOW_DISABLE_YES) {
mPolicy.enableKeyguard(true);
}
} else {
// lazily evaluate this next time we're asked to disable keyguard
mPolicy.enableKeyguard(true);
}
break; break;
} }
} }
@@ -81,24 +90,28 @@ public class KeyguardDisableHandler extends Handler {
super(handler, TAG); super(handler, TAG);
} }
@Override public void updateAllowState() {
public void acquired() {
// We fail safe and prevent disabling keyguard in the unlikely event this gets // We fail safe and prevent disabling keyguard in the unlikely event this gets
// called before DevicePolicyManagerService has started. // called before DevicePolicyManagerService has started.
if (mAllowDisableKeyguard == ALLOW_DISABLE_UNKNOWN) { DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService(
DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService( Context.DEVICE_POLICY_SERVICE);
Context.DEVICE_POLICY_SERVICE); if (dpm != null) {
if (dpm != null) { try {
try { mAllowDisableKeyguard = dpm.getPasswordQuality(null,
mAllowDisableKeyguard = dpm.getPasswordQuality(null, ActivityManagerNative.getDefault().getCurrentUser().id)
ActivityManagerNative.getDefault().getCurrentUser().id) == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED ?
== DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED ? ALLOW_DISABLE_YES : ALLOW_DISABLE_NO;
ALLOW_DISABLE_YES : ALLOW_DISABLE_NO; } catch (RemoteException re) {
} catch (RemoteException re) { // Nothing much we can do
// Nothing much we can do
}
} }
} }
}
@Override
public void acquired() {
if (mAllowDisableKeyguard == ALLOW_DISABLE_UNKNOWN) {
updateAllowState();
}
if (mAllowDisableKeyguard == ALLOW_DISABLE_YES) { if (mAllowDisableKeyguard == ALLOW_DISABLE_YES) {
mPolicy.enableKeyguard(false); mPolicy.enableKeyguard(false);
} else { } else {