Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add two disable_reasons to RouteListingPrefs

Browse Source 
- Ad in progress.
- Downloaded content.

Test: atest MediaRouter2HostSideTest
Bug: 241888071
Bug: 235352899
Change-Id: Ie45757c0ed1c9854ffb682093f3f47a602e124e8
This commit is contained in:
Santiago Seifert
2022-12-11 19:35:43 +00:00
parent 167ce476ba
commit 6ba0be57f6
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -24022,6 +24022,8 @@ package android.media {
method @NonNull public String getRouteId();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.media.RouteListingPreference.Item> CREATOR;
field public static final int DISABLE_REASON_AD = 3; // 0x3
field public static final int DISABLE_REASON_DOWNLOADED_CONTENT = 2; // 0x2
field public static final int DISABLE_REASON_NONE = 0; // 0x0
field public static final int DISABLE_REASON_SUBSCRIPTION_REQUIRED = 1; // 0x1
field public static final int FLAG_ONGOING_SESSION = 1; // 0x1

16
media/java/android/media/RouteListingPreference.java
View File

@@ -142,7 +142,12 @@ public final class RouteListingPreference implements Parcelable {
@Retention(RetentionPolicy.SOURCE)
@IntDef(
prefix = {"DISABLE_REASON_"},
value = {DISABLE_REASON_NONE, DISABLE_REASON_SUBSCRIPTION_REQUIRED})
value = {
DISABLE_REASON_NONE,
DISABLE_REASON_SUBSCRIPTION_REQUIRED,
DISABLE_REASON_DOWNLOADED_CONTENT,
DISABLE_REASON_AD
})
public @interface DisableReason {}
/** The corresponding route is available for routing. */
@@ -152,6 +157,13 @@ public final class RouteListingPreference implements Parcelable {
* routing.
*/
public static final int DISABLE_REASON_SUBSCRIPTION_REQUIRED = 1;
/**
* The corresponding route is not available because downloaded content cannot be routed to
* it.
*/
public static final int DISABLE_REASON_DOWNLOADED_CONTENT = 2;
/** The corresponding route is not available because an ad is in progress. */
public static final int DISABLE_REASON_AD = 3;
@NonNull
public static final Creator<Item> CREATOR =
@@ -216,6 +228,8 @@ public final class RouteListingPreference implements Parcelable {
*
* @see #DISABLE_REASON_NONE
* @see #DISABLE_REASON_SUBSCRIPTION_REQUIRED
* @see #DISABLE_REASON_DOWNLOADED_CONTENT
* @see #DISABLE_REASON_AD
*/
@DisableReason
public int getDisableReason() {