From d2eaa1eb6d09d43ab640b965ed18e8d68f2adfb2 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Thu, 8 Dec 2022 23:29:04 +0000 Subject: [PATCH] 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 --- media/java/android/media/audiopolicy/AudioVolumeGroup.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/java/android/media/audiopolicy/AudioVolumeGroup.java b/media/java/android/media/audiopolicy/AudioVolumeGroup.java index d58111d1e9a79..1a9ebbc56d681 100644 --- a/media/java/android/media/audiopolicy/AudioVolumeGroup.java +++ b/media/java/android/media/audiopolicy/AudioVolumeGroup.java @@ -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); }