am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit '6a5b2110eb0adbf8b9d53cf86a931b6067691f14': Fix NPE in FlashlightController
2015-03-19 23:15:02 +00:00
parent 3bc84b18b7 6a5b2110eb
commit a6e7a9b50d
1 changed files with 5 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
@@ -308,7 +308,11 @@ public class FlashlightController {
            new CameraCaptureSession.StateListener() {
        @Override
        public void onConfigured(CameraCaptureSession session) {
-            mSession = session;
+            if (session.getDevice() == mCameraDevice) {
+                mSession = session;
+            } else {
+                session.close();
+            }
            postUpdateFlashlight();
        }