diff options
author | Qiwen Zhao <zhao@google.com> | 2014-11-13 02:13:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-13 02:13:36 +0000 |
commit | e52ac94d94a03e0356d241f264e7b04ba7e2a49b (patch) | |
tree | ede4f16d5590334bb15ff8c6e5d4c83eea2048e6 | |
parent | d4cf288862fa0bfac5299d3b3ea22d3f8924baef (diff) | |
parent | 2c10ad010dc8650d43b893ecba23091e9e0dd250 (diff) | |
download | android_frameworks_ex-e52ac94d94a03e0356d241f264e7b04ba7e2a49b.tar.gz android_frameworks_ex-e52ac94d94a03e0356d241f264e7b04ba7e2a49b.tar.bz2 android_frameworks_ex-e52ac94d94a03e0356d241f264e7b04ba7e2a49b.zip |
am 2c10ad01: am e7e528ac: Merge commit \'c15ddae4862bb9a10b0142fac9558a5f899b1a21\' into lmp-mr1-dev
* commit '2c10ad010dc8650d43b893ecba23091e9e0dd250':
Ensure agent error handler is always non-null
-rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java | 18 |
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"); |