commit 82f2964eb11b568e48460cdcaf3d991f9e24c6b0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Sep 08 04:22:29 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 08 04:22:29 2023 +0000
tree 70930e1ec0d686cd9ab3dcd1b666c5764347210f
parent e9b561f39770d5ba166c7bf2e3a5317bf5863203
parent 0d0d19853ea7064ba5a89428f3d798df6a3b2681

Merge "Camera: Fix potential null pointer dereference issues" into main am: c0ccfdfb67 am: 1869eb7ab0 am: d6b76cf13c am: 0d0d19853e

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2745054

Change-Id: I7a22b0f0ded1bdd35561b8d14fd5cd279482e8d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

camera/Camera.cpp

diff --git a/camera/Camera.cpp b/camera/Camera.cpp
index 35b8e21..6b040ab 100644
--- a/camera/Camera.cpp
+++ b/camera/Camera.cpp
@@ -245,7 +245,7 @@
     ALOGV("getParameters");
     String8 params;
     sp <::android::hardware::ICamera> c = mCamera;
-    if (c != 0) params = mCamera->getParameters();
+    if (c != 0) params = c->getParameters();
     return params;
 }
 
@@ -269,7 +269,7 @@
     ALOGV("setPreviewCallbackFlags");
     sp <::android::hardware::ICamera> c = mCamera;
     if (c == 0) return;
-    mCamera->setPreviewCallbackFlag(flag);
+    c->setPreviewCallbackFlag(flag);
 }
 
 status_t Camera::setPreviewCallbackTarget(