commit c6e89f8e957fe67c347275df706256e607e5cad7
author Emilian Peev <epeev@google.com> Tue Feb 19 22:56:43 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 19 22:56:43 2019 -0800
tree 24fbafd6365e8c14664aaef3c546cd12d0c533dd
parent 6b2b2b91c7ae3a4b92c20363a9bfd33edfa620fa
parent 78a3ac5b7725d893eaf2a62784a633e4471fcd43

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

Change-Id: I50d600e4fa34780bdf2da430ba4816317f6d254d

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index f9ef996..65dd014 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -2151,7 +2151,11 @@
 
 // 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);