loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix demo app UnsafeOptInUsageError lint errors

Browse Source 
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)
This commit is contained in:
ibaker 2023-05-03 16:25:46 +00:00 committed by Ian Baker
parent feb83c2d59
commit b0b34def3d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
View File

@ -514,6 +514,7 @@ public class PlayerActivity extends AppCompatActivity
private class PlayerErrorMessageProvider implements ErrorMessageProvider<PlaybackException> { private class PlayerErrorMessageProvider implements ErrorMessageProvider<PlaybackException> {
@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
@Override @Override
public Pair<Integer, String> getErrorMessage(PlaybackException e) { public Pair<Integer, String> getErrorMessage(PlaybackException e) {
String errorString = getString(R.string.error_generic); String errorString = getString(R.string.error_generic);

3
demos/main/src/main/java/androidx/media3/demo/main/SampleChooserActivity.java
View File

@ -27,6 +27,7 @@ import android.content.pm.PackageManager;
import android.content.res.AssetManager; import android.content.res.AssetManager;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.JsonReader; import android.util.JsonReader;
@ -273,7 +274,7 @@ public class SampleChooserActivity extends AppCompatActivity
Toast.makeText(getApplicationContext(), downloadUnsupportedStringId, Toast.LENGTH_LONG) Toast.makeText(getApplicationContext(), downloadUnsupportedStringId, Toast.LENGTH_LONG)
.show(); .show();
} else if (!notificationPermissionToastShown } else if (!notificationPermissionToastShown
&& Util.SDK_INT >= 33 && Build.VERSION.SDK_INT >= 33
&& checkSelfPermission(Api33.getPostNotificationPermissionString()) && checkSelfPermission(Api33.getPostNotificationPermissionString())
!= PackageManager.PERMISSION_GRANTED) { != PackageManager.PERMISSION_GRANTED) {
downloadMediaItemWaitingForNotificationPermission = playlistHolder.mediaItems.get(0); downloadMediaItemWaitingForNotificationPermission = playlistHolder.mediaItems.get(0);