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

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

Remove usage of cacheGetStreamMinMaxVolume 

Test: make
Bug: 444268375
Flag: android.media.audio.cache_get_stream_min_max_volume
Change-Id: Ie5eb77abd6600c088a7d4afb078d6ea63808dcb3
parent 4facf500

media/java/android/media/AudioManager.java

+3 −21
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.cacheGetStreamMinMaxVolume;

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;
@@ -1291,8 +1290,7 @@ public class AudioManager { 
     * @hide

     **/

    public static void clearVolumeCache(String api) {

        if (cacheGetStreamMinMaxVolume() && (VOLUME_MAX_CACHING_API.equals(api)

                || VOLUME_MIN_CACHING_API.equals(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)) {

            IpcDataCache.invalidateCache(IpcDataCache.MODULE_SYSTEM, api);
@@ -1339,16 +1337,8 @@ public class AudioManager { 
     * @see #getStreamVolume(int)

     */

    public int getStreamMaxVolume(int streamType) {

        if (cacheGetStreamMinMaxVolume()) {

        return mVolMaxCache.query(new VolumeCacheQuery(streamType, QUERY_VOL_MAX));

    }

        final IAudioService service = getService();

        try {

            return service.getStreamMaxVolume(streamType);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Returns the minimum volume index for a particular stream.
@@ -1375,16 +1365,8 @@ public class AudioManager { 
     */

    @TestApi

    public int getStreamMinVolumeInt(int streamType) {

        if (cacheGetStreamMinMaxVolume()) {

        return mVolMinCache.query(new VolumeCacheQuery(streamType, QUERY_VOL_MIN));

    }

        final IAudioService service = getService();

        try {

            return service.getStreamMinVolume(streamType);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Returns the current volume index for a particular stream.

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

+3 −6
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.cacheGetStreamMinMaxVolume;

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

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

import static android.media.audio.Flags.dapInjectionStarveManagement;
@@ -5505,8 +5504,7 @@ public class AudioService extends IAudioService.Stub 
                + ringMyCar());

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

                + concurrentAudioRecordBypassPermission());

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

                + cacheGetStreamMinMaxVolume());

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

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

                + cacheGetStreamVolume());

        pw.println("\tcom.android.media.audio.optimizeBtDeviceSwitch:"
@@ -10082,7 +10080,7 @@ public class AudioService extends IAudioService.Stub 
                    mIndexMinNoPerm = mIndexMin;

                }

            }

            if (cacheGetStreamMinMaxVolume() && mStreamType == AudioSystem.STREAM_VOICE_CALL) {

            if (mStreamType == AudioSystem.STREAM_VOICE_CALL) {

                if (DEBUG_VOL) {

                    Log.d(TAG, "Clear min volume cache from updateIndexFactors");

                }
@@ -10134,8 +10132,7 @@ public class AudioService extends IAudioService.Stub 
         * @param index minimum index expressed in "UI units", i.e. no 10x factor

         */

        public void updateNoPermMinIndex(int index) {

            boolean changedNoPermMinIndex =

                    cacheGetStreamMinMaxVolume() && (index * 10) != mIndexMinNoPerm;

            boolean changedNoPermMinIndex = (index * 10) != mIndexMinNoPerm;

            mIndexMinNoPerm = index * 10;

            if (mIndexMinNoPerm < mIndexMin) {

                Log.e(TAG, "Invalid mIndexMinNoPerm for stream " + mStreamType);