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

Commit 328c0f98 authored by Karthik Bharadwaj's avatar Karthik Bharadwaj Committed by Automerger Merge Worker
Browse files

Merge "Refactor Global Mic Disable" into sc-dev am: 05dfc3d8 

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

Change-Id: I6b790633bb76f5f687321ceedb2cf9ec9a9ed0be
parents b7e4cc51 05dfc3d8

services/core/java/com/android/server/location/contexthub/ContextHubService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -301,7 +301,7 @@ public class ContextHubService extends IContextHubService.Stub { 
            mSensorPrivacyManagerInternal.addSensorPrivacyListenerForAllUsers(

            mSensorPrivacyManagerInternal.addSensorPrivacyListenerForAllUsers(

                    SensorPrivacyManager.Sensors.MICROPHONE, (userId, enabled) -> {

                    SensorPrivacyManager.Sensors.MICROPHONE, (userId, enabled) -> {

                        if (userId == getCurrentUserId()) {

                        if (userId == getCurrentUserId()) {

                            Log.d(TAG, "User: " + userId + " enabled: " + enabled);

                            Log.d(TAG, "User: " + userId + "mic privacy: " + enabled);

                            sendMicrophoneDisableSettingUpdate(enabled);

                            sendMicrophoneDisableSettingUpdate(enabled);

                        }

                        }

                });

                });

services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -324,8 +324,11 @@ public abstract class IContextHubWrapper { 
        }

        }





        public void onMicrophoneDisableSettingChanged(boolean enabled) {

        public void onMicrophoneDisableSettingChanged(boolean enabled) {

            sendSettingChanged(android.hardware.contexthub.V1_2.Setting.GLOBAL_MIC_DISABLE,

            // The SensorPrivacyManager reports if microphone privacy was enabled,

                    enabled ? SettingValue.ENABLED : SettingValue.DISABLED);

            // which translates to microphone access being disabled (and vice-versa).

            // With this in mind, we flip the argument before piping it to CHRE.

            sendSettingChanged(android.hardware.contexthub.V1_2.Setting.MICROPHONE,

                    enabled ? SettingValue.DISABLED : SettingValue.ENABLED);

        }

        }





        private void sendSettingChanged(byte setting, byte newValue) {

        private void sendSettingChanged(byte setting, byte newValue) {