commit aa5c53f6737f919254be00853e0bd177d34d54e7
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 02 16:32:59 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 02 16:32:59 2022 +0000
tree 7f36e72ac2cbebb6bec80ebb403ef14e430cd8bc
parent e8f564ee0e7663cb18723f1fa06269e932379f0f
parent fa17f09bfaa4c31f8c448ba24ae84b6d4a6eacb0

Merge "Camera: Ensure that 'opChanged' can access a valid device instance"

services/camera/libcameraservice/common/Camera2ClientBase.cpp

diff --git a/services/camera/libcameraservice/common/Camera2ClientBase.cpp b/services/camera/libcameraservice/common/Camera2ClientBase.cpp
index 6f43270..f926b88 100644
--- a/services/camera/libcameraservice/common/Camera2ClientBase.cpp
+++ b/services/camera/libcameraservice/common/Camera2ClientBase.cpp
@@ -105,11 +105,6 @@
           TClientBase::mCameraIdStr.string());
     status_t res;
 
-    // Verify ops permissions
-    res = TClientBase::startCameraOps();
-    if (res != OK) {
-        return res;
-    }
     IPCTransport providerTransport = IPCTransport::INVALID;
     res = providerPtr->getCameraIdIPCTransport(TClientBase::mCameraIdStr.string(),
             &providerTransport);
@@ -145,6 +140,14 @@
         return res;
     }
 
+    // Verify ops permissions
+    res = TClientBase::startCameraOps();
+    if (res != OK) {
+        TClientBase::finishCameraOps();
+        mDevice.clear();
+        return res;
+    }
+
     wp<NotificationListener> weakThis(this);
     res = mDevice->setNotifyCallback(weakThis);
     if (res != OK) {