Skip to content

Commit 05227c9

Browse files
icbakercopybara-github
authored andcommitted
Allow empty package name on API 36 Samsung devices
PiperOrigin-RevId: 827877520
1 parent f305ff1 commit 05227c9

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

libraries/session/src/main/java/androidx/media3/session/SessionTokenImplLegacy.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package androidx.media3.session;
1717

18+
import static android.os.Build.VERSION.SDK_INT;
1819
import static androidx.media3.session.SessionToken.TYPE_BROWSER_SERVICE_LEGACY;
1920
import static androidx.media3.session.SessionToken.TYPE_LIBRARY_SERVICE;
2021
import static androidx.media3.session.SessionToken.TYPE_SESSION;
@@ -24,6 +25,7 @@
2425

2526
import android.content.ComponentName;
2627
import android.media.session.MediaSession;
28+
import android.os.Build;
2729
import android.os.Bundle;
2830
import android.text.TextUtils;
2931
import androidx.annotation.Nullable;
@@ -74,7 +76,9 @@ private SessionTokenImplLegacy(
7476
@Nullable ComponentName componentName,
7577
String packageName,
7678
Bundle extras) {
77-
checkArgument(!TextUtils.isEmpty(packageName));
79+
// packageName can be blank on some API 36 Samsung devices: b/450752936#comment5
80+
checkArgument(
81+
(Build.MANUFACTURER.equals("samsung") && SDK_INT == 36) || !TextUtils.isEmpty(packageName));
7882
this.legacyToken = legacyToken;
7983
this.uid = uid;
8084
this.type = type;

0 commit comments

Comments
 (0)