commit e028da5f12d0d0e8fd0241051e59bcaae1b85b19
author Jan Sebechlebsky <jsebechlebsky@google.com> Tue Dec 20 14:42:50 2022 +0100
committer Jan Sebechlebsky <jsebechlebsky@google.com> Wed Dec 21 10:35:26 2022 +0100
tree 256cf94edcbbd5921240de1a6593e5c9e3ca80d4
parent fdc16a549ab0334eebe873707b6f1f6fab1570de

Fix session id validation in VirtualDeviceParams.Builder

Bug: 261698699
Bug: 249777386
Test: atest VirtualDeviceParams VirtualDeviceManagerBasicTest
Change-Id: Ic61165f9be6c8e88acccb00a64de262f8b005e44

core/java/android/companion/virtual/VirtualDeviceParams.java

diff --git a/core/java/android/companion/virtual/VirtualDeviceParams.java b/core/java/android/companion/virtual/VirtualDeviceParams.java
index 597b0f5..d4a0a08 100644
--- a/core/java/android/companion/virtual/VirtualDeviceParams.java
+++ b/core/java/android/companion/virtual/VirtualDeviceParams.java
@@ -758,7 +758,7 @@
          */
         @NonNull
         public Builder setAudioPlaybackSessionId(int playbackSessionId) {
-            if (playbackSessionId != AUDIO_SESSION_ID_GENERATE || playbackSessionId < 0) {
+            if (playbackSessionId < 0) {
                 throw new IllegalArgumentException("Invalid playback audio session id");
             }
             mAudioPlaybackSessionId = playbackSessionId;
@@ -782,7 +782,7 @@
          */
         @NonNull
         public Builder setAudioRecordingSessionId(int recordingSessionId) {
-            if (recordingSessionId != AUDIO_SESSION_ID_GENERATE || recordingSessionId < 0) {
+            if (recordingSessionId < 0) {
                 throw new IllegalArgumentException("Invalid recording audio session id");
             }
             mAudioRecordingSessionId = recordingSessionId;