commit 4ff55c663cdbcd8ff071d774831d391dbe269a1f
author John Spurlock <jspurlock@google.com> Thu Jul 24 18:12:58 2014 -0400
committer The Android Automerger <android-build@google.com> Thu Jul 24 18:26:04 2014 -0700
tree 9a8ccb596f08056965b79018af10ad76fa5bacfc
parent 75a5d9e241f688e40cffe8051c2dab5666267dc6

QS: Handle all camera api exceptions during init.

Temporary workaround to unblock certain devices.

Bug:16547333
Change-Id: I80d8ec609e5c32b9db290576c5ec791ad915c45c

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

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 e05e34b..36cfb86 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
@@ -77,7 +77,7 @@
     public void initialize() {
         try {
             mCameraId = getCameraId();
-        } catch (CameraAccessException e) {
+        } catch (Throwable e) {
             Log.e(TAG, "Couldn't initialize.", e);
             return;
         }