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

Commit e98e90dc authored by Hayden Gomes's avatar Hayden Gomes Committed by Android (Google) Code Review
Browse files

Merge changes from topic "AudioProductStrategies-API" into qt-dev 

* changes:
  Replacing AudioVolumeGroups with List
  Cleaning up SeekBarVolumizer
  Removing name getter from AudioProductStrategy
  Replacing AudioProductStrategies with List
parents 40ec9664 ebd6aaa4

api/system-current.txt

+2 −29
Original line number Diff line number Diff line
@@ -3498,8 +3498,8 @@ package android.media { 
    method @Deprecated public int abandonAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, android.media.AudioAttributes);

    method public void clearAudioServerStateCallback();

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int dispatchAudioFocusChange(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public android.media.audiopolicy.AudioProductStrategies getAudioProductStrategies();

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public android.media.audiopolicy.AudioVolumeGroups getAudioVolumeGroups();

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static java.util.List<android.media.audiopolicy.AudioProductStrategy> getAudioProductStrategies();

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static java.util.List<android.media.audiopolicy.AudioVolumeGroup> getAudioVolumeGroups();

    method @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getMaxVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);

    method @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getMinVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);

    method @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);
@@ -3678,27 +3678,10 @@ package android.media.audiopolicy { 
    method @NonNull public android.media.audiopolicy.AudioPolicy.Builder setLooper(@NonNull android.os.Looper) throws java.lang.IllegalArgumentException;

  }













  public final class AudioProductStrategies implements java.lang.Iterable<android.media.audiopolicy.AudioProductStrategy> android.os.Parcelable {













    ctor public AudioProductStrategies();













    method public int describeContents();













    method @NonNull public android.media.AudioAttributes getAudioAttributesForLegacyStreamType(int);













    method @NonNull public android.media.AudioAttributes getAudioAttributesForProductStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy);













    method @Nullable public android.media.audiopolicy.AudioProductStrategy getById(int);













    method public int getLegacyStreamTypeForAudioAttributes(@NonNull android.media.AudioAttributes);













    method @Nullable public android.media.audiopolicy.AudioProductStrategy getProductStrategyForAudioAttributes(@NonNull android.media.AudioAttributes);













    method public int getVolumeGroupIdForAttributes(@NonNull android.media.AudioAttributes);













    method public int getVolumeGroupIdForLegacyStreamType(int);













    method @NonNull public java.util.Iterator<android.media.audiopolicy.AudioProductStrategy> iterator();













    method public int size();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.media.audiopolicy.AudioProductStrategies> CREATOR;













  }



























  public final class AudioProductStrategy implements android.os.Parcelable {















    method public int describeContents();















    method @NonNull public android.media.AudioAttributes getAudioAttributes();















    method public int getId();













    method @NonNull public String name();















    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.media.audiopolicy.AudioProductStrategy> CREATOR;















  }









@@ -3711,16 +3694,6 @@ package android.media.audiopolicy {













    method @NonNull public String name();















    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.media.audiopolicy.AudioVolumeGroup> CREATOR;













  }

























  public final class AudioVolumeGroups implements java.lang.Iterable<android.media.audiopolicy.AudioVolumeGroup> android.os.Parcelable {













    ctor public AudioVolumeGroups();













    method public int describeContents();













    method @Nullable public android.media.audiopolicy.AudioVolumeGroup getById(int);













    method @NonNull public java.util.Iterator<android.media.audiopolicy.AudioVolumeGroup> iterator();













    method public int size();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.media.audiopolicy.AudioVolumeGroups> CREATOR;















    field public static final int DEFAULT_VOLUME_GROUP = -1; // 0xffffffff















  }















































core/java/android/preference/SeekBarVolumizer.java



+49
−18




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@





























package android.preference;





























import android.annotation.NonNull;















import android.annotation.UnsupportedAppUsage;















import android.app.NotificationManager;















import android.content.BroadcastReceiver;









@@ -27,8 +28,8 @@ import android.media.AudioAttributes;













import android.media.AudioManager;















import android.media.Ringtone;















import android.media.RingtoneManager;













import android.media.audiopolicy.AudioProductStrategies;













import android.media.audiopolicy.AudioVolumeGroups;













import android.media.audiopolicy.AudioProductStrategy;













import android.media.audiopolicy.AudioVolumeGroup;















import android.net.Uri;















import android.os.Handler;















import android.os.HandlerThread;










@@ -67,7 +68,6 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba





























    private static final int MSG_GROUP_VOLUME_CHANGED = 1;















    private final Handler mVolumeHandler = new VolumeHandler();













    private final AudioProductStrategies mAudioProductStrategies;















    private AudioAttributes mAttributes;















    private int mVolumeGroupId;


























@@ -161,11 +161,9 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba













        }















        mZenMode = mNotificationManager.getZenMode();





























        mAudioProductStrategies = mAudioManager.getAudioProductStrategies();













        if (mAudioProductStrategies.size() > 0) {













            mVolumeGroupId = mAudioProductStrategies.getVolumeGroupIdForLegacyStreamType(













                    mStreamType);













            mAttributes = mAudioProductStrategies.getAudioAttributesForLegacyStreamType(













        if (hasAudioProductStrategies()) {













            mVolumeGroupId = getVolumeGroupIdForLegacyStreamType(mStreamType);













            mAttributes = getAudioAttributesForLegacyStreamType(















                    mStreamType);















        }

























@@ -190,6 +188,40 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba













        mDefaultUri = defaultUri;















    }





























    private boolean hasAudioProductStrategies() {













        return AudioManager.getAudioProductStrategies().size() > 0;













    }



























    private int getVolumeGroupIdForLegacyStreamType(int streamType) {













        for (final AudioProductStrategy productStrategy :













                AudioManager.getAudioProductStrategies()) {













            int volumeGroupId = productStrategy.getVolumeGroupIdForLegacyStreamType(streamType);













            if (volumeGroupId != AudioVolumeGroup.DEFAULT_VOLUME_GROUP) {













                return volumeGroupId;













            }













        }



























        return AudioManager.getAudioProductStrategies().stream()













                .map(strategy -> strategy.getVolumeGroupIdForAudioAttributes(













                        AudioProductStrategy.sDefaultAttributes))













                .filter(volumeGroupId -> volumeGroupId != AudioVolumeGroup.DEFAULT_VOLUME_GROUP)













                .findFirst()













                .orElse(AudioVolumeGroup.DEFAULT_VOLUME_GROUP);













    }



























    private @NonNull AudioAttributes getAudioAttributesForLegacyStreamType(int streamType) {













        for (final AudioProductStrategy productStrategy :













                AudioManager.getAudioProductStrategies()) {













            AudioAttributes aa = productStrategy.getAudioAttributesForLegacyStreamType(streamType);













            if (aa != null) {













                return aa;













            }













        }













        return new AudioAttributes.Builder()













                .setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)













                .setUsage(AudioAttributes.USAGE_UNKNOWN).build();













    }





























    private static boolean isNotificationOrRing(int stream) {















        return stream == AudioManager.STREAM_RING || stream == AudioManager.STREAM_NOTIFICATION;















    }










@@ -329,7 +361,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba













        postStopSample();















        mContext.getContentResolver().unregisterContentObserver(mVolumeObserver);















        mReceiver.setListening(false);













        if (mAudioProductStrategies.size() > 0) {













        if (hasAudioProductStrategies()) {















            unregisterVolumeGroupCb();















        }















        mSeekBar.setOnSeekBarChangeListener(null);









@@ -349,7 +381,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba













                System.getUriFor(System.VOLUME_SETTINGS_INT[mStreamType]),















                false, mVolumeObserver);















        mReceiver.setListening(true);













        if (mAudioProductStrategies.size() > 0) {













        if (hasAudioProductStrategies()) {















            registerVolumeGroupCb();















        }















    }










@@ -507,7 +539,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba













            if (AudioManager.VOLUME_CHANGED_ACTION.equals(action)) {















                int streamType = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, -1);















                int streamValue = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, -1);













                if (mAudioProductStrategies.size() == 0) {













                if (hasAudioProductStrategies()) {















                    updateVolumeSlider(streamType, streamValue);















                }















            } else if (AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION.equals(action)) {









@@ -519,13 +551,12 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba













                }















            } else if (AudioManager.STREAM_DEVICES_CHANGED_ACTION.equals(action)) {















                int streamType = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, -1);













                if (mAudioProductStrategies.size() == 0) {













                if (hasAudioProductStrategies()) {















                    int streamVolume = mAudioManager.getStreamVolume(streamType);















                    updateVolumeSlider(streamType, streamVolume);















                } else {













                    int volumeGroup = mAudioProductStrategies.getVolumeGroupIdForLegacyStreamType(













                            streamType);













                    if (volumeGroup != AudioVolumeGroups.DEFAULT_VOLUME_GROUP













                    int volumeGroup = getVolumeGroupIdForLegacyStreamType(streamType);













                    if (volumeGroup != AudioVolumeGroup.DEFAULT_VOLUME_GROUP















                            && volumeGroup == mVolumeGroupId) {















                        int streamVolume = mAudioManager.getStreamVolume(streamType);















                        updateVolumeSlider(streamType, streamVolume);










@@ -558,14 +589,14 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba













    }































    private void registerVolumeGroupCb() {













        if (mVolumeGroupId != AudioVolumeGroups.DEFAULT_VOLUME_GROUP) {













        if (mVolumeGroupId != AudioVolumeGroup.DEFAULT_VOLUME_GROUP) {















            mAudioManager.registerVolumeGroupCallback(Runnable::run, mVolumeGroupCallback);















            mLastProgress = mAudioManager.getVolumeIndexForAttributes(mAttributes);















        }















    }































    private void unregisterVolumeGroupCb() {













        if (mVolumeGroupId != AudioVolumeGroups.DEFAULT_VOLUME_GROUP) {













        if (mVolumeGroupId != AudioVolumeGroup.DEFAULT_VOLUME_GROUP) {















            mAudioManager.unregisterVolumeGroupCallback(mVolumeGroupCallback);















        }















    }









@@ -578,7 +609,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba













                case MSG_GROUP_VOLUME_CHANGED:















                    int group = (int) args.arg1;















                    if (mVolumeGroupId != group













                            || mVolumeGroupId == AudioVolumeGroups.DEFAULT_VOLUME_GROUP) {













                            || mVolumeGroupId == AudioVolumeGroup.DEFAULT_VOLUME_GROUP) {















                        return;















                    }















                    updateSlider();

































core/jni/android_media_AudioProductStrategies.cpp



+1
−23




























Original line number
Diff line number
Diff line








@@ -39,7 +39,7 @@













using namespace android;































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













static const char* const kClassPathName = "android/media/audiopolicy/AudioProductStrategies";













static const char* const kClassPathName = "android/media/audiopolicy/AudioProductStrategy";















static const char* const kAudioProductStrategyClassPathName =















        "android/media/audiopolicy/AudioProductStrategy";


























@@ -194,34 +194,12 @@ exit:













    return jStatus;















}





























static jint













android_media_AudioSystem_getProductStrategyFromAudioAttributes(JNIEnv *env, jobject clazz,













                                                                jobject jAudioAttributes)













{













    JNIAudioAttributeHelper::UniqueAaPtr attributes = JNIAudioAttributeHelper::makeUnique();













    jint jStatus = JNIAudioAttributeHelper::nativeFromJava(env,













                                                           jAudioAttributes,













                                                           attributes.get());













    if (jStatus != (jint)AUDIO_JAVA_SUCCESS) {













        return jStatus;













    }













    product_strategy_t psId;













    status_t status = AudioSystem::getProductStrategyFromAudioAttributes(













                AudioAttributes(*attributes.get()), psId);













    if (status != NO_ERROR) {













        return nativeToJavaStatus(status);













    }













    return psId;













}





























/*















 * JNI registration.















 */















static const JNINativeMethod gMethods[] = {















    {"native_list_audio_product_strategies", "(Ljava/util/ArrayList;)I",















                        (void *)android_media_AudioSystem_listAudioProductStrategies},













    {"native_get_product_strategies_from_audio_attributes", "(Landroid/media/AudioAttributes;)I",













                        (void *)android_media_AudioSystem_getProductStrategyFromAudioAttributes},















};































int register_android_media_AudioProductStrategies(JNIEnv *env)

































core/jni/android_media_AudioVolumeGroups.cpp



+1
−1




























Original line number
Diff line number
Diff line








@@ -39,7 +39,7 @@













using namespace android;































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













static const char* const kClassPathName = "android/media/audiopolicy/AudioVolumeGroups";













static const char* const kClassPathName = "android/media/audiopolicy/AudioVolumeGroup";















static const char* const kAudioVolumeGroupClassPathName =















        "android/media/audiopolicy/AudioVolumeGroup";

















































media/java/android/media/AudioAttributes.java



+7
−7




























Original line number
Diff line number
Diff line








@@ -20,7 +20,7 @@ import android.annotation.IntDef;













import android.annotation.NonNull;















import android.annotation.SystemApi;















import android.annotation.UnsupportedAppUsage;













import android.media.audiopolicy.AudioProductStrategies;













import android.media.audiopolicy.AudioProductStrategy;















import android.os.Build;















import android.os.Bundle;















import android.os.Parcel;










@@ -783,9 +783,10 @@ public final class AudioAttributes implements Parcelable {













         */















        @UnsupportedAppUsage















        public Builder setInternalLegacyStreamType(int streamType) {













            final AudioProductStrategies ps = new AudioProductStrategies();













            if (ps.size() > 0) {













                AudioAttributes attributes = ps.getAudioAttributesForLegacyStreamType(streamType);













            if (AudioProductStrategy.getAudioProductStrategies().size() > 0) {













                AudioAttributes attributes =













                        AudioProductStrategy.getAudioAttributesForStrategyWithLegacyStreamType(













                                streamType);















                if (attributes != null) {















                    return new Builder(attributes);















                }










@@ -1165,9 +1166,8 @@ public final class AudioAttributes implements Parcelable {













                    AudioSystem.STREAM_MUSIC : AudioSystem.STREAM_TTS;















        }





























        final AudioProductStrategies ps = new AudioProductStrategies();













        if (ps.size() > 0) {













            return ps.getLegacyStreamTypeForAudioAttributes(aa);













        if (AudioProductStrategy.getAudioProductStrategies().size() > 0) {













            return AudioProductStrategy.getLegacyStreamTypeForStrategyWithAudioAttributes(aa);















        }















        // usage to stream type mapping















        switch (aa.getUsage()) {