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

Merge "Fix AudioMix.equals()"

Browse Source
This commit is contained in:
Eric Laurent
2023-04-26 07:18:16 +00:00
committed by Gerrit Code Review
parent bd3b1b81ee 46456d7af4
commit e86d8d8b43
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
media/java/android/media/audiopolicy/AudioMix.java
View File

@@ -25,6 +25,8 @@ import android.media.AudioFormat;
import android.media.AudioSystem; import android.media.AudioSystem;
import android.os.Build; import android.os.Build;
import com.android.internal.annotations.VisibleForTesting;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.Objects; import java.util.Objects;
@@ -252,10 +254,10 @@ public class AudioMix {
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
final AudioMix that = (AudioMix) o; final AudioMix that = (AudioMix) o;
return (this.mRouteFlags == that.mRouteFlags) return Objects.equals(this.mRouteFlags, that.mRouteFlags)
&& (this.mRule == that.mRule) && Objects.equals(this.mRule, that.mRule)
&& (this.mMixType == that.mMixType) && Objects.equals(this.mMixType, that.mMixType)
&& (this.mFormat == that.mFormat); && Objects.equals(this.mFormat, that.mFormat);
} }
/** @hide */ /** @hide */
@@ -340,7 +342,8 @@ public class AudioMix {
* @param address * @param address
* @return the same Builder instance. * @return the same Builder instance.
*/ */
Builder setDevice(int deviceType, String address) { @VisibleForTesting
public Builder setDevice(int deviceType, String address) {
mDeviceSystemType = deviceType; mDeviceSystemType = deviceType;
mDeviceAddress = address; mDeviceAddress = address;
return this; return this;