Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 538b836e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix bug where swiping on the fp sensor when the screen is off causes... 

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

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }

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

+4 −0
Original line number Diff line number Diff line
@@ -112,6 +112,10 @@ public final class KeyguardMonitor extends KeyguardUpdateMonitorCallback { 
        notifyKeyguardChanged();

    }



    public boolean isDeviceInteractive() {

        return mKeyguardUpdateMonitor.isDeviceInteractive();

    }



    private void updateCanSkipBouncerState() {

        mCanSkipBouncer = mKeyguardUpdateMonitor.getUserCanSkipBouncer(mCurrentUser);

    }