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

Commit ac777cd8 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "AudioService: remove flag for Bluetooth address anonymization" into main

parents 327adf87 c79ab5d3

services/core/java/com/android/server/audio/AudioService.java

+0 −6
Original line number Original line Diff line number Diff line
@@ -42,7 +42,6 @@ import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE; 
















import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;







import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;











import static com.android.media.audio.Flags.alarmMinVolumeZero;







import static com.android.media.audio.Flags.alarmMinVolumeZero;











import static com.android.media.audio.Flags.bluetoothMacAddressAnonymization;














import static com.android.media.audio.Flags.disablePrescaleAbsoluteVolume;







import static com.android.media.audio.Flags.disablePrescaleAbsoluteVolume;











import static com.android.media.audio.Flags.ringerModeAffectsAlarm;







import static com.android.media.audio.Flags.ringerModeAffectsAlarm;











import static com.android.server.audio.SoundDoseHelper.ACTION_CHECK_MUSIC_ACTIVE;







import static com.android.server.audio.SoundDoseHelper.ACTION_CHECK_MUSIC_ACTIVE;










@@ -4522,8 +4521,6 @@ public class AudioService extends IAudioService.Stub









                + autoPublicVolumeApiHardening());







                + autoPublicVolumeApiHardening());











        pw.println("\tandroid.media.audio.focusFreezeTestApi:"







        pw.println("\tandroid.media.audio.focusFreezeTestApi:"











                + focusFreezeTestApi());







                + focusFreezeTestApi());











        pw.println("\tcom.android.media.audio.bluetoothMacAddressAnonymization:"














                + bluetoothMacAddressAnonymization());














        pw.println("\tcom.android.media.audio.disablePrescaleAbsoluteVolume:"







        pw.println("\tcom.android.media.audio.disablePrescaleAbsoluteVolume:"











                + disablePrescaleAbsoluteVolume());







                + disablePrescaleAbsoluteVolume());











        pw.println("\tandroid.media.audiopolicy.enableFadeManagerConfiguration:"







        pw.println("\tandroid.media.audiopolicy.enableFadeManagerConfiguration:"










@@ -10650,9 +10647,6 @@ public class AudioService extends IAudioService.Stub









    }







    }



























    private boolean isBluetoothPrividged() {







    private boolean isBluetoothPrividged() {











        if (!bluetoothMacAddressAnonymization()) {














            return true;














        }














        return PackageManager.PERMISSION_GRANTED == mContext.checkCallingOrSelfPermission(







        return PackageManager.PERMISSION_GRANTED == mContext.checkCallingOrSelfPermission(











                android.Manifest.permission.BLUETOOTH_CONNECT)







                android.Manifest.permission.BLUETOOTH_CONNECT)











                || Binder.getCallingUid() == Process.SYSTEM_UID;







                || Binder.getCallingUid() == Process.SYSTEM_UID;