diff options
| author | 2024-11-07 21:27:58 +0000 | |
|---|---|---|
| committer | 2024-11-07 21:27:58 +0000 | |
| commit | ad5797542a4f17518ba66ed75d5838ae7268b043 (patch) | |
| tree | b5ff0f5ec4ecfd3151e33102812446b5b42f4875 | |
| parent | 4c64c3b9f6da7a07d9a7f79f3de8b447823d5110 (diff) | |
| parent | dec13bc178821c419bee9b9a74841ad55ac1c668 (diff) | |
Merge "Add android.permission.TV_IMPLICIT_ENTER_PIP" into main
| -rw-r--r-- | tests/cts/permissionpolicy/Android.bp | 1 | ||||
| -rw-r--r-- | tests/cts/permissionpolicy/res/raw/android_manifest.xml | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/tests/cts/permissionpolicy/Android.bp b/tests/cts/permissionpolicy/Android.bp index 4249f3c9d..07fde8bff 100644 --- a/tests/cts/permissionpolicy/Android.bp +++ b/tests/cts/permissionpolicy/Android.bp @@ -37,6 +37,7 @@ android_test { "permission-test-util-lib", "androidx.test.rules", "flag-junit", + "android.app.flags-aconfig", "android.permission.flags-aconfig-java-export", ], srcs: [ diff --git a/tests/cts/permissionpolicy/res/raw/android_manifest.xml b/tests/cts/permissionpolicy/res/raw/android_manifest.xml index ae9521bf9..d30931c3f 100644 --- a/tests/cts/permissionpolicy/res/raw/android_manifest.xml +++ b/tests/cts/permissionpolicy/res/raw/android_manifest.xml @@ -4268,6 +4268,18 @@ android:description="@string/permdesc_hideOverlayWindows" android:protectionLevel="normal" /> + <!-- Allows an app to enter Picture-in-Picture mode when the user is not explicitly requesting + it. This includes using {@link PictureInPictureParams.Builder#setAutoEnterEnabled} as well + as lifecycle methods such as {@link Activity#onUserLeaveHint} and {@link Activity#onPause} + to enter PiP when the user leaves the app. + This permission should only be used for certain PiP + <a href="{@docRoot}training/tv/get-started/multitasking#usage-types">usage types</a>. + @FlaggedApi("android.app.enable_tv_implicit_enter_pip_restriction") + --> + <permission android:name="android.permission.TV_IMPLICIT_ENTER_PIP" + android:protectionLevel="normal" + android:featureFlag="android.app.enable_tv_implicit_enter_pip_restriction" /> + <!-- ================================== --> <!-- Permissions affecting the system wallpaper --> <!-- ================================== --> |