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

Commit a5910a9c authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
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 am: 538b836e
am: ba350f35

Change-Id: Ia83a8afd2d55f53b90b17307e3214ee581de9ca6
parents 30bf7cd2 ba350f35

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

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

    }