diff options
| author | 2024-08-01 20:49:21 +0000 | |
|---|---|---|
| committer | 2024-08-01 20:49:21 +0000 | |
| commit | 640ed5aa1e8bd31ffb8a42caef20e28d91487018 (patch) | |
| tree | e23b738044c6b3286bb93ddab20a9d5509292350 | |
| parent | 47881f64286c15ebe81b9e4500c7857073ed9078 (diff) | |
| parent | 910467b65e2ba659a3338bbd6788e265c4ae1c7b (diff) | |
Merge "TIS: Add `android:featureFlag` attribute to the new `ALWAYS_BOUND_TV_INPUT` permission." into main
| -rw-r--r-- | core/res/Android.bp | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | media/java/android/media/tv/flags/media_tv.aconfig | 8 |
3 files changed, 11 insertions, 1 deletions
diff --git a/core/res/Android.bp b/core/res/Android.bp index 9207aa8e9c24..e900eb2f01ab 100644 --- a/core/res/Android.bp +++ b/core/res/Android.bp @@ -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", ], } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a00cc8b91627..50727a2415c6 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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. diff --git a/media/java/android/media/tv/flags/media_tv.aconfig b/media/java/android/media/tv/flags/media_tv.aconfig index 97971e134f02..3196ba124d76 100644 --- a/media/java/android/media/tv/flags/media_tv.aconfig +++ b/media/java/android/media/tv/flags/media_tv.aconfig @@ -23,4 +23,12 @@ flag { namespace: "media_tv" 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 |