Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor Global Mic Disable" into sc-dev

Browse Source
This commit is contained in:
Karthik Bharadwaj
2021-03-25 09:24:09 +00:00
committed by Android (Google) Code Review
parent 8fe0541d85 3ab94db67a
commit 05dfc3d849
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/location/contexthub/ContextHubService.java
View File

@@ -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);
} }
}); });

7
services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java
View File

@@ -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) {