| commit | d9f21cc4d81132ad5f9a158ae4551e7a1fbd0223 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Nov 22 21:38:43 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 22 21:38:43 2022 +0000 |
| tree | e70927992f3906be4a29bb61abe32451e13b017c | |
| parent | af5152afc171ee65ea1112e8106bdced76971ccf [diff] | |
| parent | 4afa0e260e7bb3bf01ac1489249ddda41a0de361 [diff] |
Merge "Fix an issue that the sensor privacy does not apply to the new camera clients" am: 4afa0e260e Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2287277 Change-Id: I8fedb4dd04ea7f102196d610cedb1535ae8dc396 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 a78112d..2388b79 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp
@@ -3978,7 +3978,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) {