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

Commit 640ed5aa authored by Sherry Huang's avatar Sherry Huang Committed by Android (Google) Code Review
Browse files

Merge "TIS: Add `android:featureFlag` attribute to the new... 

Merge "TIS: Add `android:featureFlag` attribute to the new `ALWAYS_BOUND_TV_INPUT` permission." into main
parents 47881f64 910467b6

core/res/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ android_app { 
        "com.android.window.flags.window-aconfig",

        "android.permission.flags-aconfig",

        "android.os.flags-aconfig",

        "android.media.tv.flags-aconfig",

    ],

}

core/res/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -5609,7 +5609,8 @@ 
         @hide

    -->

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

        android:protectionLevel="signature|privileged|vendorPrivileged" />

        android:protectionLevel="signature|privileged|vendorPrivileged"

        android:featureFlag="android.media.tv.flags.tis_always_bound_permission"/>



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

         to ensure that only the system can bind to it.

media/java/android/media/tv/flags/media_tv.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -24,3 +24,11 @@ flag { 
    description: "TIAF V3.0 APIs for Android V"

    bug: "303323657"

}



flag {

    name: "tis_always_bound_permission"

    is_exported: true

    namespace: "media_tv"

    description: "Introduce ALWAYS_BOUND_TV_INPUT for TIS."

    bug: "332201346"

}
 
 No newline at end of file