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

Merge "Fix bug where swiping on the fp sensor when the screen is off causes blank screen" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-14 23:45:11 +00:00
committed by Android (Google) Code Review
parent f3d9863d5e 26e8fc012a
commit 538b836e05
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -2586,7 +2586,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
@Override
public void handleSystemNavigationKey(int key) {
if (SPEW) Log.d(TAG, "handleSystemNavigationKey: " + key);
if (!panelsEnabled()) {
if (!panelsEnabled() || !mKeyguardMonitor.isDeviceInteractive()) {
return;
}

4
packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java
View File

@@ -112,6 +112,10 @@ public final class KeyguardMonitor extends KeyguardUpdateMonitorCallback {
notifyKeyguardChanged();
}
public boolean isDeviceInteractive() {
return mKeyguardUpdateMonitor.isDeviceInteractive();
}
private void updateCanSkipBouncerState() {
mCanSkipBouncer = mKeyguardUpdateMonitor.getUserCanSkipBouncer(mCurrentUser);
}