From 694d690bc03a34e112afc6cca58eb2761a25402a Mon Sep 17 00:00:00 2001 From: tonihei Date: Mon, 3 Apr 2023 11:45:15 +0100 Subject: [PATCH] Improve check for invalid connection request The check currently relies on the default value of 0 returned if the Bundle doesn't define a pid. But in some cases, like Robolectric unit tests, 0 is a possible pid. The check can be improved by directly asserting that the value is defined. PiperOrigin-RevId: 521414649 --- .../main/java/androidx/media3/session/ConnectionRequest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/session/src/main/java/androidx/media3/session/ConnectionRequest.java b/libraries/session/src/main/java/androidx/media3/session/ConnectionRequest.java index 037baff628..b9f6258594 100644 --- a/libraries/session/src/main/java/androidx/media3/session/ConnectionRequest.java +++ b/libraries/session/src/main/java/androidx/media3/session/ConnectionRequest.java @@ -89,8 +89,8 @@ import androidx.media3.common.util.Util; int controllerInterfaceVersion = bundle.getInt(FIELD_CONTROLLER_INTERFACE_VERSION, /* defaultValue= */ 0); String packageName = checkNotNull(bundle.getString(FIELD_PACKAGE_NAME)); - int pid = bundle.getInt(FIELD_PID, /* defaultValue= */ 0); - checkArgument(pid != 0); + checkArgument(bundle.containsKey(FIELD_PID)); + int pid = bundle.getInt(FIELD_PID); @Nullable Bundle connectionHints = bundle.getBundle(FIELD_CONNECTION_HINTS); return new ConnectionRequest( libraryVersion,