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

Commit d2eaa1eb authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Fix AudioVolumeGroup equality check 

Strings should be compared with String.equals, not with ==

Bug: 255429175
Test: atest android.media.audio.cts.VolumeInfoTest
Change-Id: I5d1d487a721f4de177dc9b50f37daf1c8861666b
parent e66e4c20

media/java/android/media/audiopolicy/AudioVolumeGroup.java

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public final class AudioVolumeGroup implements Parcelable { 
    /**

     * human-readable name of this volume group.

     */

    private final String mName;

    private final @NonNull String mName;



    private final AudioAttributes[] mAudioAttributes;

    private int[] mLegacyStreamTypes;
@@ -113,7 +113,7 @@ public final class AudioVolumeGroup implements Parcelable { 


        AudioVolumeGroup thatAvg = (AudioVolumeGroup) o;



        return mName == thatAvg.mName && mId == thatAvg.mId

        return mName.equals(thatAvg.mName) && mId == thatAvg.mId

                && Arrays.equals(mAudioAttributes, thatAvg.mAudioAttributes);

    }