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

Commit 803046eb authored by Atneya Nair's avatar Atneya Nair
Browse files

audio: permission flag cleanup 

Test: compiles
Bug: 338089555
Flag: com.android.media.audio.audioserver_permissions
Change-Id: I14dd17aed734f7bd208ab4fb60c2dd0ef6401bbe
parent 730e53f8

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

+5 −17
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ import static com.android.internal.annotations.VisibleForTesting.Visibility.PACK 
import static com.android.media.audio.Flags.absVolumePrioritizesAbsDevice;

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

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

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

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

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

import static com.android.media.audio.Flags.equalScoHaVcIndexRange;
@@ -1331,10 +1330,8 @@ public class AudioService extends IAudioService.Stub 
                              null,

                              context.getSystemService(AppOpsManager.class),

                              PermissionEnforcer.fromContext(context),

                              audioserverPermissions() ?

                              initializeAudioServerPermissionProvider(

                                    context, audioPolicyFacade, audioserverLifecycleExecutor) :

                                    null,

                                    context, audioPolicyFacade, audioserverLifecycleExecutor),

                              audioserverLifecycleExecutor

                              );

        }
@@ -1968,9 +1965,7 @@ public class AudioService extends IAudioService.Stub 














    public void onSystemReady() {















        mSystemReady = true;













        if (audioserverPermissions()) {















        setupPermissionListener();













        }















        scheduleLoadSoundEffects();















        mDeviceBroker.onSystemReady();
























@@ -5447,8 +5442,6 @@ public class AudioService extends IAudioService.Stub













                + featureSpatialAudioHeadtrackingLowLatency());















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















                + focusFreezeTestApi());













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













                + audioserverPermissions());















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















                + disablePrescaleAbsoluteVolume());















        pw.println("\tcom.android.media.audio.setStreamVolumeOrder - EOL");










@@ -13876,18 +13869,14 @@ public class AudioService extends IAudioService.Stub



























        @Override















        public void addAssistantServiceUid(int uid, int owningUid) {













            if (audioserverPermissions()) {















            mPermissionProvider.setIsolatedServiceUid(uid, owningUid);













            }















            sendMsg(mAudioHandler, MSG_ADD_ASSISTANT_SERVICE_UID, SENDMSG_QUEUE,















                    uid, 0, null, 0);















        }





























        @Override















        public void removeAssistantServiceUid(int uid) {













            if (audioserverPermissions()) {















            mPermissionProvider.clearIsolatedServiceUid(uid);













            }















            sendMsg(mAudioHandler, MSG_REMOVE_ASSISTANT_SERVICE_UID, SENDMSG_QUEUE,















                    uid, 0, null, 0);















        }










@@ -15901,7 +15890,6 @@ public class AudioService extends IAudioService.Stub













    @Override















    /** @see AudioManager#permissionUpdateBarrier() */















    public void permissionUpdateBarrier() {













        if (!audioserverPermissions()) return;















        mCacheWatcher.doCheck();















        List<Future> snapshot;















        synchronized (mScheduledPermissionTasks) {