Merge "Camera: Avoid invalid member variable access from RequestThread"

5 years ago · aaa51ee218
parent 411c94ab97 e86358b8af
commit aaa51ee218
1 changed files with 5 additions and 1 deletions
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@ -1804,7 +1804,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);