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

Commit 37a9f82f authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

am 288f65e3: Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev 

automerge: 4a915ab5

* commit '4a915ab5':
  Fix NPE in FlashlightController
  Fix stale unlock icon
parents 732f4f72 4a915ab5

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

+5 −0
Original line number Diff line number Diff line
@@ -477,6 +477,11 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        public void onScreenTurnedOff(int why) {

            updateLockIcon();

        }



        @Override

        public void onKeyguardVisibilityChanged(boolean showing) {

            updateLockIcon();

        }

    };



    public void setKeyguardIndicationController(

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

+5 −1
Original line number Diff line number Diff line
@@ -308,7 +308,11 @@ public class FlashlightController { 
            new CameraCaptureSession.StateListener() {

        @Override

        public void onConfigured(CameraCaptureSession session) {

            if (session.getDevice() == mCameraDevice) {

                mSession = session;

            } else {

                session.close();

            }

            postUpdateFlashlight();

        }