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

Commit b6ac8b9b authored by Vlad Popa's avatar Vlad Popa
Browse files

Remove usage of cacheGetStreamVolume 

Test: make
Bug: 444211159
Flag: android.media.audio.cache_get_stream_volume
Change-Id: I590ac9acb8995ae602f8837bb956bd1e77011271
parent c4ddc777

media/java/android/media/AudioManager.java

+2 −11
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import static android.media.audio.Flags.FLAG_SCO_MANAGED_BY_AUDIO; 
import static android.media.audio.Flags.FLAG_SUPPORTED_DEVICE_TYPES_API;

import static android.media.audio.Flags.FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT;

import static android.media.audio.Flags.autoPublicVolumeApiHardening;

import static android.media.audio.Flags.cacheGetStreamVolume;

import static android.media.audiopolicy.Flags.FLAG_ENABLE_FADE_MANAGER_CONFIGURATION;

import static android.media.audiopolicy.Flags.FLAG_MULTI_ZONE_AUDIO;
@@ -1292,7 +1291,7 @@ public class AudioManager { 
    public static void clearVolumeCache(String api) {

        if (VOLUME_MAX_CACHING_API.equals(api) || VOLUME_MIN_CACHING_API.equals(api)) {

            IpcDataCache.invalidateCache(IpcDataCache.MODULE_SYSTEM, api);

        } else if (cacheGetStreamVolume() && VOLUME_CACHING_API.equals(api)) {

        } else if (VOLUME_CACHING_API.equals(api)) {

            IpcDataCache.invalidateCache(IpcDataCache.MODULE_SYSTEM, api);

        } else {

            Log.w(TAG, "invalid clearVolumeCache for api " + api);
@@ -1377,16 +1376,8 @@ public class AudioManager { 
     * @see #setStreamVolume(int, int, int)

     */

    public int getStreamVolume(int streamType) {

        if (cacheGetStreamVolume()) {

        return mVolCache.query(new VolumeCacheQuery(streamType, QUERY_VOL));

    }

        final IAudioService service = getService();

        try {

            return service.getStreamVolume(streamType);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    // keep in sync with frameworks/av/services/audiopolicy/common/include/Volume.h

    private static final float VOLUME_MIN_DB = -758.0f;

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

+20 −32
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import static android.media.AudioManager.RINGER_MODE_SILENT; 
import static android.media.AudioManager.RINGER_MODE_VIBRATE;

import static android.media.AudioManager.STREAM_SYSTEM;

import static android.media.audio.Flags.autoPublicVolumeApiHardening;

import static android.media.audio.Flags.cacheGetStreamVolume;

import static android.media.audio.Flags.concurrentAudioRecordBypassPermission;

import static android.media.audio.Flags.dapInjectionStarveManagement;

import static android.media.audio.Flags.deviceVolumeApis;
@@ -2038,13 +2037,11 @@ public class AudioService extends IAudioService.Stub 
            mSpatializerHelper.onRoutingUpdated();

        }

        checkMuteAwaitConnection();

        if (cacheGetStreamVolume()) {

        if (DEBUG_VOL) {

            Log.d(TAG, "Clear volume cache after routing update");

        }

        AudioManager.clearVolumeCache(AudioManager.VOLUME_CACHING_API);

    }

    }















    //-----------------------------------------------------------------















    // rotation/fold updates coming from RotationHelper










@@ -2803,7 +2800,6 @@ public class AudioService extends IAudioService.Stub













        checkMuteAffectedStreams();















        updateDefaultVolumes();



























        if (cacheGetStreamVolume()) {















        if (DEBUG_VOL) {















            Log.d(TAG, "Clear volume cache after creating the stream states");















        }









@@ -2811,7 +2807,6 @@ public class AudioService extends IAudioService.Stub













        AudioManager.clearVolumeCache(AudioManager.VOLUME_MIN_CACHING_API);















        AudioManager.clearVolumeCache(AudioManager.VOLUME_MAX_CACHING_API);















    }













    }





























    /**















     * Update default indexes from aliased streams. Must be called after mStreamStates is created










@@ -5505,8 +5500,7 @@ public class AudioService extends IAudioService.Stub













        pw.println("\tandroid.media.audio.Flags.concurrentAudioRecordBypassPermission:"















                + concurrentAudioRecordBypassPermission());















        pw.println("\tandroid.media.audio.Flags.cacheGetStreamMinMaxVolume - EOL");













        pw.println("\tandroid.media.audio.Flags.cacheGetStreamVolume:"













                + cacheGetStreamVolume());













        pw.println("\tandroid.media.audio.Flags.cacheGetStreamVolume - EOL");















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















                + optimizeBtDeviceSwitch());















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










@@ -7595,14 +7589,12 @@ public class AudioService extends IAudioService.Stub













                    streamState.mIsMuted = false;















                }















            }













            if (cacheGetStreamVolume()) {















            if (DEBUG_VOL) {















                Log.d(TAG,















                        "Clear volume cache after possibly changing mute in readAudioSettings");















            }















            AudioManager.clearVolumeCache(AudioManager.VOLUME_CACHING_API);















        }













        }





























        readVolumeGroupsSettings(userSwitch);
























@@ -9953,24 +9945,20 @@ public class AudioService extends IAudioService.Stub













            public void put(int key, int value) {















                super.put(key, value);















                record("put", key, value);













                if (cacheGetStreamVolume()) {















                if (DEBUG_VOL) {















                    Log.d(TAG, "Clear volume cache after update index map");















                }















                AudioManager.clearVolumeCache(AudioManager.VOLUME_CACHING_API);















            }













            }















            @Override















            public void setValueAt(int index, int value) {















                super.setValueAt(index, value);















                record("setValueAt", keyAt(index), value);













                if (cacheGetStreamVolume()) {















                if (DEBUG_VOL) {















                    Log.d(TAG, "Clear volume cache after update index map");















                }















                AudioManager.clearVolumeCache(AudioManager.VOLUME_CACHING_API);















            }













            }





























            // Record all changes in the VolumeStreamState















            private void record(String event, int key, int value) {










@@ -10729,7 +10717,7 @@ public class AudioService extends IAudioService.Stub













                }















            }



























            if (cacheGetStreamVolume() && changed) {













            if (changed) {















                if (DEBUG_VOL) {















                    Log.d(TAG, "Clear volume cache after changing mute state");















                }