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

Keyguard: Improve trusted unlock while occluded

Browse Source 
Smoothly unlocks device when going from a SHOW_WHEN_LOCKED activity
to a DISMISS_KEYGUARD activity while the device is trusted.

This change suppresses the jank from going briefly through the
lockscreen if the device is trusted and unlockable without entering
a credential.

Bug: 27410215
Change-Id: Idd86e825d37a89538a0a1f690daf6afcf94a0699
This commit is contained in:
Adrian Roos
2016-08-04 14:52:06 -07:00
parent d88eb2693b
commit ddcdecc952
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -3562,7 +3562,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
@Override
public boolean canShowDismissingWindowWhileLockedLw() {
return false;
// If the keyguard is trusted, it will unlock without a challange. Therefore, windows with
// FLAG_DISMISS_KEYGUARD don't need to be force hidden, as they will unlock the phone right
// away anyways.
return mKeyguardDelegate != null && mKeyguardDelegate.isTrusted();
}
private void launchAssistLongPressAction() {
@@ -5261,7 +5264,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
} else if (mDismissKeyguard != DISMISS_KEYGUARD_NONE) {
mKeyguardHidden = false;
if (setKeyguardOccludedLw(false)) {
final boolean trusted = mKeyguardDelegate.isTrusted();
if (trusted) {
// No need to un-occlude keyguard - we'll dimiss it right away anyways.
} else if (setKeyguardOccludedLw(false)) {
changes |= FINISH_LAYOUT_REDO_LAYOUT
| FINISH_LAYOUT_REDO_CONFIG
| FINISH_LAYOUT_REDO_WALLPAPER;
@@ -5271,7 +5277,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mHandler.post(new Runnable() {
@Override
public void run() {
mKeyguardDelegate.dismiss(false /* allowWhileOccluded */);
mKeyguardDelegate.dismiss(trusted /* allowWhileOccluded */);
}
});
}