Merge "Fix AudioVolumeGroup equality check" (2168db19) · Commits · e / os / android_frameworks_base

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