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

Commit 8e8e9ce6 authored by Hayden Gomes's avatar Hayden Gomes
Browse files

Removing name getter from AudioProductStrategy 

Test: ran make and flashed onto device
Bug: 129265140
Change-Id: Ia6dad73e954f45b30cab970386e8fd3a66416ede
parent 6d69bde3

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -3681,7 +3681,6 @@ package android.media.audiopolicy { 
    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;

  }

media/java/android/media/audiopolicy/AudioProductStrategy.java

+2 −12
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public final class AudioProductStrategy implements Parcelable { 
                        audioAttributes);

                if (streamType == AudioSystem.STREAM_DEFAULT) {

                    Log.w(TAG, "Attributes " + audioAttributes.toString() + " ported by strategy "

                            + productStrategy.name() + " has no stream type associated, "

                            + productStrategy.getId() + " has no stream type associated, "

                            + "DO NOT USE STREAM TO CONTROL THE VOLUME");

                    return AudioSystem.STREAM_MUSIC;

                }
@@ -153,8 +153,7 @@ public final class AudioProductStrategy implements Parcelable { 
    /**

     * @param name of the product strategy

     * @param id of the product strategy

     * @param audioAttributes {@link AudioAttributes} associated to the given product strategy

     * @param legacyStreamTypes associated to the given product strategy.

     * @param aag {@link AudioAttributesGroup} associated to the given product strategy

     */

    private AudioProductStrategy(@NonNull String name, int id,

            @NonNull AudioAttributesGroup[] aag) {
@@ -165,15 +164,6 @@ public final class AudioProductStrategy implements Parcelable { 
        mAudioAttributesGroups = aag;

    }



    /**

     * @hide

     * @return human-readable name of this product strategy, which is similar to a usage

     */

    @SystemApi

    public @NonNull String name() {

        return mName;

    }



    /**

     * @hide

     * @return the product strategy ID (which is the generalisation of Car Audio Usage / legacy