Merge "Fix unmuting both cam and mic at the same time" into sc-dev am: 31bb5762d8 am: 586e18cc0e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081504 Change-Id: I41a82ce12fa6d49fc004c586738dd2ae9b97e4eb
2021-06-23 20:17:36 +00:00
parent bf6b06d5f4 586e18cc0e
commit afc59c79f8
1 changed files with 6 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/sensorprivacy/SensorUseStartedActivity.kt
+++ b/packages/SystemUI/src/com/android/systemui/sensorprivacy/SensorUseStartedActivity.kt
@@ -218,7 +218,12 @@ class SensorUseStartedActivity @Inject constructor(
    }

    private fun disableSensorPrivacy() {
-        sensorPrivacyController.setSensorBlocked(sensor, false)
+        if (sensor == ALL_SENSORS) {
+            sensorPrivacyController.setSensorBlocked(MICROPHONE, false)
+            sensorPrivacyController.setSensorBlocked(CAMERA, false)
+        } else {
+            sensorPrivacyController.setSensorBlocked(sensor, false)
+        }
        unsuppressImmediately = true
        setResult(RESULT_OK)
    }