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

Commit 104d8fb1 authored by Shubang Lu's avatar Shubang Lu Committed by Android (Google) Code Review
Browse files

Merge "Add permission BIND_TV_AD_SERVICE" into main

parents cd230552 6263e144

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ package android { 
    field public static final String BIND_SCREENING_SERVICE = "android.permission.BIND_SCREENING_SERVICE";

    field public static final String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE";

    field public static final String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";

    field @FlaggedApi("android.media.tv.flags.enable_ad_service_fw") public static final String BIND_TV_AD_SERVICE = "android.permission.BIND_TV_AD_SERVICE";

    field public static final String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT";

    field public static final String BIND_TV_INTERACTIVE_APP = "android.permission.BIND_TV_INTERACTIVE_APP";

    field public static final String BIND_VISUAL_VOICEMAIL_SERVICE = "android.permission.BIND_VISUAL_VOICEMAIL_SERVICE";

core/res/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -5214,6 +5214,14 @@ 
    <permission android:name="android.permission.BIND_REMOTE_DISPLAY"

        android:protectionLevel="signature" />



    <!-- Must be required by a android.media.tv.ad.TvAdService to ensure that only the system can

         bind to it.

         <p>Protection level: signature|privileged

         @FlaggedApi("android.media.tv.flags.enable_ad_service_fw")

    -->

    <permission android:name="android.permission.BIND_TV_AD_SERVICE"

                android:protectionLevel="signature|privileged" />



    <!-- Must be required by a {@link android.media.tv.TvInputService}

         to ensure that only the system can bind to it.

         <p>Protection level: signature|privileged