am 6c2fa7f2: am ca507f86: Merge "Log null returns from Camera.getParameters" into lmp-dev

* commit '6c2fa7f20c7dc4f2d425f07b39cb574291c3ed15':
  Log null returns from Camera.getParameters

1 files changed, 6 insertions, 3 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 358d5f6..949ac62 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
@@ -225,6 +225,10 @@ class AndroidCameraAgentImpl extends CameraAgent {
         public synchronized Parameters getBlocking() {
             if (mParameters == null) {
                 mParameters = mCamera.getParameters();
+                if (mParameters == null) {
+                    Log.e(TAG, "Camera object returned null parameters!");
+                    throw new IllegalStateException("camera.getParameters returned null");
+                }
             }
             return mParameters;
         }
@@ -911,9 +915,8 @@ class AndroidCameraAgentImpl extends CameraAgent {
             mDispatchThread.runJobSync(new Runnable() {
                 @Override
                 public void run() {
-                    Message getParametersMessage = mCameraHandler.obtainMessage(
-                            CameraActions.GET_PARAMETERS, parametersHolder);
-                    mCameraHandler.sendMessage(getParametersMessage);
+                    mCameraHandler.obtainMessage(
+                            CameraActions.GET_PARAMETERS, parametersHolder).sendToTarget();
                     mCameraHandler.post(bundle.mUnlockRunnable);
                 }
             }, bundle.mWaitLock, CAMERA_OPERATION_TIMEOUT_MS, "get parameters");