Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4190b857 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add two disable_reasons to RouteListingPrefs"

parents 23321160 6ba0be57

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -24058,6 +24058,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

media/java/android/media/RouteListingPreference.java

+15 −1
Original line number Diff line number Diff line
@@ -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() {