| commit | 2019ff15c01414b90ffc5a32c0ad481e00670efe | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Nov 22 22:06:25 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 22 22:06:25 2022 +0000 |
| tree | 85da26fd05db69cce87e8238354ebda5349e0e3c | |
| parent | 21d509eb1ccdd25b5c84dcaed29527ad7fb9e84e [diff] | |
| parent | d9f21cc4d81132ad5f9a158ae4551e7a1fbd0223 [diff] |
Merge "Fix an issue that the sensor privacy does not apply to the new camera clients" am: 4afa0e260e am: d9f21cc4d8 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2287277 Change-Id: Ie056ad4fbf46f4d9fb5ce6d4c451d6bea6048617 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 1115920..f7c75ae 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp
@@ -3985,7 +3985,7 @@ int toggleType __unused, int sensor __unused, bool enabled) { { Mutex::Autolock _l(mSensorPrivacyLock); - mSensorPrivacyEnabled = mSpm.isToggleSensorPrivacyEnabled(SensorPrivacyManager::TOGGLE_SENSOR_CAMERA); + mSensorPrivacyEnabled = enabled; } // if sensor privacy is enabled then block all clients from accessing the camera if (enabled) {