commit 3486ab7a0ca2d444c24101c927664bcb2e29dada
author Emilian Peev <epeev@google.com> Mon Oct 25 18:24:19 2021 -0700
committer Emilian Peev <epeev@google.com> Wed Oct 27 21:05:11 2021 +0000
tree 10efcc70cef677b9d523c75e1302fefad71f4fb0
parent 2bcfe35ee2df052c7891cde30a4eae95e7f098f1

Camera: Avoid possible instability when adding new devices

In cases where camera provider is having issues
"initializeDeviceInfo" may fail to return valid device
information.
Try to avoid possible instabilities and check the return
parameter before trying to access it.

Bug: 204111448
Test: Camera CTS
Change-Id: I3561f38cb7e5aacd9f5f62bda77caddb648a2578

services/camera/libcameraservice/common/CameraProviderManager.cpp

diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index b10a4c4..2f74df9 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -1631,7 +1631,6 @@
         case 3:
             deviceInfo = initializeDeviceInfo<DeviceInfo3>(name, mProviderTagid,
                     id, minor);
-            deviceInfo->notifyDeviceStateChange(mDeviceState);
             break;
         default:
             ALOGE("%s: Device %s: Unknown HIDL device HAL major version %d:", __FUNCTION__,
@@ -1639,6 +1638,7 @@
             return BAD_VALUE;
     }
     if (deviceInfo == nullptr) return BAD_VALUE;
+    deviceInfo->notifyDeviceStateChange(mDeviceState);
     deviceInfo->mStatus = initialStatus;
     bool isAPI1Compatible = deviceInfo->isAPI1Compatible();