am e7e528ac: Merge commit \'c15ddae4862bb9a10b0142fac9558a5f899b1a21\' into lmp-mr1-dev

* commit 'e7e528accaef2dfdc4c74c3ad116ede1cbb0c2e9':
  Ensure agent error handler is always non-null

1 files changed, 17 insertions, 1 deletions

diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
index 9910dd9..cdd6993 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
@@ -55,7 +55,23 @@ class AndroidCameraAgentImpl extends CameraAgent {
     private final HandlerThread mCameraHandlerThread;
     private final CameraStateHolder mCameraState;
     private final DispatchThread mDispatchThread;
-    private CameraExceptionHandler mExceptionHandler;
+    private CameraExceptionHandler mExceptionHandler = new CameraExceptionHandler(null) {
+        @Override
+        public void onCameraError(int errorCode) {
+            Log.w(TAG, "onCameraError called before handler set: " + errorCode);
+        }
+
+        @Override
+        public void onCameraException(RuntimeException ex, String commandHistory, int action,
+                int state) {
+            Log.w(TAG, "onCameraException called before handler set", ex);
+        }
+
+        @Override
+        public void onDispatchThreadException(RuntimeException ex) {
+            Log.w(TAG, "onDispatchThreadException called before handler set", ex);
+        }
+    };
 
     AndroidCameraAgentImpl() {
         mCameraHandlerThread = new HandlerThread("Camera Handler Thread");