commit 8c6dd4e4208df831066be8ccd1fd937d1ee12e72
author Jayant Chowdhary <jchowdhary@google.com> Thu Oct 18 23:31:40 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 18 23:31:40 2018 -0700
tree 5f3c32b0c010d916d38ab59475079c1eb4559826
parent 00969d2ed7846085d18d7ffa5d44987448baf1d9
parent 2e6bb43bc132a07dce8fcc5f6960dee23282dab1

Merge "camera2 ndk: Fix error code passed on ACameraDevice_ErrorStateCallback." am: 31215a03a3 am: d7d5ad51d1
am: 2e6bb43bc1

Change-Id: I442019c4eac6be8365841a0d09dd42f968e024e2

camera/ndk/impl/ACameraDevice.cpp

diff --git a/camera/ndk/impl/ACameraDevice.cpp b/camera/ndk/impl/ACameraDevice.cpp
index 5ba76d9..ac3be25 100644
--- a/camera/ndk/impl/ACameraDevice.cpp
+++ b/camera/ndk/impl/ACameraDevice.cpp
@@ -1294,12 +1294,17 @@
         case ERROR_CAMERA_DEVICE:
         case ERROR_CAMERA_SERVICE:
         {
+            int32_t errorVal = ::ERROR_CAMERA_DEVICE;
+            // We keep this switch since this block might be encountered with
+            // more than just 2 states. The default fallthrough could have us
+            // handling more unmatched error cases.
             switch (errorCode) {
                 case ERROR_CAMERA_DEVICE:
                     dev->setCameraDeviceErrorLocked(ACAMERA_ERROR_CAMERA_DEVICE);
                     break;
                 case ERROR_CAMERA_SERVICE:
                     dev->setCameraDeviceErrorLocked(ACAMERA_ERROR_CAMERA_SERVICE);
+                    errorVal = ::ERROR_CAMERA_SERVICE;
                     break;
                 default:
                     dev->setCameraDeviceErrorLocked(ACAMERA_ERROR_UNKNOWN);
@@ -1309,7 +1314,7 @@
             msg->setPointer(kContextKey, dev->mAppCallbacks.context);
             msg->setPointer(kDeviceKey, (void*) dev->getWrapper());
             msg->setPointer(kCallbackFpKey, (void*) dev->mAppCallbacks.onError);
-            msg->setInt32(kErrorCodeKey, errorCode);
+            msg->setInt32(kErrorCodeKey, errorVal);
             msg->post();
             break;
         }