From e028da5f12d0d0e8fd0241051e59bcaae1b85b19 Mon Sep 17 00:00:00 2001
From: Jan Sebechlebsky <jsebechlebsky@google.com>
Date: Tue, 20 Dec 2022 14:42:50 +0100
Subject: [PATCH] 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/companion/virtual/VirtualDeviceParams.java b/core/java/android/companion/virtual/VirtualDeviceParams.java
index 597b0f51fb82f..d4a0a08717136 100644
--- a/core/java/android/companion/virtual/VirtualDeviceParams.java
+++ b/core/java/android/companion/virtual/VirtualDeviceParams.java
@@ -758,7 +758,7 @@ public final class VirtualDeviceParams implements Parcelable {
          */
         @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 @@ public final class VirtualDeviceParams implements Parcelable {
          */
         @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;