Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix AudioVolumeGroup equality check"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-12-09 22:21:23 +00:00
committed by Android (Google) Code Review
parent 31b64067e3 d2eaa1eb6d
commit 2168db194b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/audiopolicy/AudioVolumeGroup.java
View File

@@ -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);
}