commit e7aa034ba9e4ed14dec3623fa8b90f3c17cb2bad
author Shuzhen Wang <shuzhenwang@google.com> Tue Aug 03 11:29:47 2021 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Wed Aug 04 14:02:48 2021 -0700
tree fdbd55fc37e6253dbeba0a240672dc7cc8babb81
parent f9b5b73314a0aeffe5209080d4f786ddcb193890

Camera: Fix onCameraOpened/onCameraClosed callback

Add client package id in the CameraStatus interface, so that
addListener will return the currently opened cameras if the
client has the permission.

Bug: 193475498
Test: testCameraManagerListenerCallbacks
Change-Id: Ic78b80526c3f55a450caa54e27c3d36265b127b9

camera/CameraBase.cpp

diff --git a/camera/CameraBase.cpp b/camera/CameraBase.cpp
index 03439fd..24c9108 100644
--- a/camera/CameraBase.cpp
+++ b/camera/CameraBase.cpp
@@ -68,6 +68,9 @@
         unavailablePhysicalIds16.push_back(String16(id8));
     }
     res = parcel->writeString16Vector(unavailablePhysicalIds16);
+    if (res != OK) return res;
+
+    res = parcel->writeString16(String16(clientPackage));
     return res;
 }
 
@@ -86,6 +89,12 @@
     for (auto& id16 : unavailablePhysicalIds16) {
         unavailablePhysicalIds.push_back(String8(id16));
     }
+
+    String16 tempClientPackage;
+    res = parcel->readString16(&tempClientPackage);
+    if (res != OK) return res;
+    clientPackage = String8(tempClientPackage);
+
     return res;
 }