From 54eb845d9f16b6c42f379965e65ebc0629e4bd3b Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Mon, 27 Oct 2014 16:55:36 +0100
Subject: [PATCH] Fix NPE in FlashlightController

Bug: 18007548
Change-Id: Iecd1303feeb8062741752862312043ecd75cebbe
(cherry picked from commit fa81d2126aae262a60b194877daadfb9ed1d50da)
---
 .../systemui/statusbar/policy/FlashlightController.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
index 6f021aca15f15..33f7affe892f8 100644
--- 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();
         }