From b0b34def3d53742e1f87f45316fe6e8bff9d182c Mon Sep 17 00:00:00 2001 From: ibaker Date: Wed, 3 May 2023 16:25:46 +0000 Subject: [PATCH] Fix demo app UnsafeOptInUsageError lint errors This change: * Adds missing `@OptIn` annotation to demo app's `ErrorMessageProvider` * Switches from `Util.SDK_INT` to `Build.VERSION.SDK_INT` in `SampleChooserActivity` (`PlayerActivity` is already using this). This code hasn't changed recently, and it doesn't fail on the `release` branch, but it failed when I checked the `main` branch just now - so I assume lint has updated to detect more cases where unstable APIs are being used without opt-in. I suspect the difference is due to different Android Gradle Plugin versions between the branches. #minor-release PiperOrigin-RevId: 529111669 (cherry picked from commit ebcdd983e2c5a9819d8a66873351bccbf93124c6) --- .../main/java/androidx/media3/demo/main/PlayerActivity.java | 1 + .../java/androidx/media3/demo/main/SampleChooserActivity.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java b/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java index 22ee82e179..d812c2ffbf 100644 --- a/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java +++ b/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java @@ -514,6 +514,7 @@ public class PlayerActivity extends AppCompatActivity private class PlayerErrorMessageProvider implements ErrorMessageProvider { + @OptIn(markerClass = androidx.media3.common.util.UnstableApi.class) @Override public Pair getErrorMessage(PlaybackException e) { String errorString = getString(R.string.error_generic); diff --git a/demos/main/src/main/java/androidx/media3/demo/main/SampleChooserActivity.java b/demos/main/src/main/java/androidx/media3/demo/main/SampleChooserActivity.java index ef01b148ca..5afa2613e3 100644 --- a/demos/main/src/main/java/androidx/media3/demo/main/SampleChooserActivity.java +++ b/demos/main/src/main/java/androidx/media3/demo/main/SampleChooserActivity.java @@ -27,6 +27,7 @@ import android.content.pm.PackageManager; import android.content.res.AssetManager; import android.net.Uri; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; import android.text.TextUtils; import android.util.JsonReader; @@ -273,7 +274,7 @@ public class SampleChooserActivity extends AppCompatActivity Toast.makeText(getApplicationContext(), downloadUnsupportedStringId, Toast.LENGTH_LONG) .show(); } else if (!notificationPermissionToastShown - && Util.SDK_INT >= 33 + && Build.VERSION.SDK_INT >= 33 && checkSelfPermission(Api33.getPostNotificationPermissionString()) != PackageManager.PERMISSION_GRANTED) { downloadMediaItemWaitingForNotificationPermission = playlistHolder.mediaItems.get(0);