commit a40db3343cb2595f57931eea792f0a6d73d6101f
author Android Build Prod User <android-build-prod@system.gserviceaccount.com> Wed Aug 25 15:15:47 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 25 15:15:47 2021 +0000
tree 4b98413f3851c58a7f1426c30bfee3ab28835f73
parent 22557982dd2f49e10d1bf2b2dbc07a0753715943
parent 84a19f64f5fd2786a96b85fc5db88c1be82b6b0c

Merge "Undefine NAN after including it in Looper.h" into sc-dev-plus-aosp

camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp

diff --git a/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp b/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp
index 4cff1b7..7c3b982 100644
--- a/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp
+++ b/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp
@@ -450,7 +450,9 @@
         const sp<ICameraProviderCallback>& callback) {
     Mutex::Autolock _l(mCbLock);
     mCallbacks = callback;
-
+    if (mCallbacks == nullptr) {
+        return Status::OK;
+    }
     // Add and report all presenting external cameras.
     for (auto const& statusPair : mCameraStatusMap) {
         int id = std::stoi(statusPair.first);

gnss/1.0/vts/functional/OWNERS

diff --git a/gnss/1.0/vts/functional/OWNERS b/gnss/1.0/vts/functional/OWNERS
new file mode 100644
index 0000000..b831eb4
--- /dev/null
+++ b/gnss/1.0/vts/functional/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 393449
+yuhany@google.com