summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dennis Shen <dzshen@google.com> 2024-04-04 19:33:34 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-04-04 19:33:34 +0000
commitf547e9c75c9dd98494cebb4b4562a4a570f25d7c (patch)
tree7e1b54648aea553a4bb2f6269c4718fc48c7ddcb
parent33547eef32ce4e1be8110180b73d8aca7015d0c9 (diff)
parent31dba19bdde9b303bdf6115b5300c72a02269124 (diff)
Merge "Add container to .aconfig" into main
-rw-r--r--libs/WindowManager/Shell/aconfig/Android.bp1
-rw-r--r--libs/WindowManager/Shell/aconfig/multitasking.aconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/aconfig/Android.bp b/libs/WindowManager/Shell/aconfig/Android.bp
index 1a98ffcea9e7..7f8f57b172ff 100644
--- a/libs/WindowManager/Shell/aconfig/Android.bp
+++ b/libs/WindowManager/Shell/aconfig/Android.bp
@@ -1,6 +1,7 @@
aconfig_declarations {
name: "com_android_wm_shell_flags",
package: "com.android.wm.shell",
+ container: "system",
srcs: [
"multitasking.aconfig",
],
diff --git a/libs/WindowManager/Shell/aconfig/multitasking.aconfig b/libs/WindowManager/Shell/aconfig/multitasking.aconfig
index b61dda4c4e53..7ff204c695f8 100644
--- a/libs/WindowManager/Shell/aconfig/multitasking.aconfig
+++ b/libs/WindowManager/Shell/aconfig/multitasking.aconfig
@@ -1,4 +1,5 @@
package: "com.android.wm.shell"
+container: "system"
flag {
name: "enable_app_pairs"