Merge "Camera: Avoid invalid member variable access from RequestThread" am: aaa51ee218 am: 6b12cf9640

am: 78a3ac5b77 Change-Id: I50d600e4fa34780bdf2da430ba4816317f6d254d
5 years ago · c6e89f8e95
parent 6b2b2b91c7 78a3ac5b77
commit c6e89f8e95
1 changed files with 5 additions and 1 deletions
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@ -2151,7 +2151,11 @@ void Camera3Device::pauseStateNotify(bool enable) {

 // Pause to reconfigure
 status_t Camera3Device::internalPauseAndWaitLocked(nsecs_t maxExpectedDuration) {
-    mRequestThread->setPaused(true);
+    if (mRequestThread.get() != nullptr) {
+        mRequestThread->setPaused(true);
+    } else {
+        return NO_INIT;
+    }

    ALOGV("%s: Camera %s: Internal wait until idle (% " PRIi64 " ns)", __FUNCTION__, mId.string(),
          maxExpectedDuration);