Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e41fa89 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix unmuting both cam and mic at the same time" into sc-dev am: 31bb5762 am: 9deb1fbf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081504

Change-Id: I453a96ef02817efb166fe8ba6695755409704158
parents b588a1a7 9deb1fbf

packages/SystemUI/src/com/android/systemui/sensorprivacy/SensorUseStartedActivity.kt

+6 −1
Original line number Original line Diff line number Diff line
@@ -218,7 +218,12 @@ class SensorUseStartedActivity @Inject constructor( 
    }

    }





    private fun disableSensorPrivacy() {

    private fun disableSensorPrivacy() {

        if (sensor == ALL_SENSORS) {

            sensorPrivacyController.setSensorBlocked(MICROPHONE, false)

            sensorPrivacyController.setSensorBlocked(CAMERA, false)

        } else {

            sensorPrivacyController.setSensorBlocked(sensor, false)

            sensorPrivacyController.setSensorBlocked(sensor, false)

        }

        unsuppressImmediately = true

        unsuppressImmediately = true

        setResult(RESULT_OK)

        setResult(RESULT_OK)

    }

    }