summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2024-12-04 15:58:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-12-04 15:58:38 +0000
commit41998961c110e2912d8c9da403d962f81b8de4f7 (patch)
treed4ef309c4b9fc548ec5e3fcee085b9d1236644b0
parentd8968f5c13bce1ccefd6d0aecaaacc44407c60c1 (diff)
parent70ded9fe46795be0f914ee8bde538f0fe325b4ae (diff)
Merge "Rename use_ipcdatacache_channels in favor of nm_binder_perf_cache_channels" into main
-rw-r--r--core/java/android/app/notification.aconfig7
-rw-r--r--services/core/java/com/android/server/notification/flags.aconfig7
2 files changed, 7 insertions, 7 deletions
diff --git a/core/java/android/app/notification.aconfig b/core/java/android/app/notification.aconfig
index 8b6840c1b552..7543fa9f581f 100644
--- a/core/java/android/app/notification.aconfig
+++ b/core/java/android/app/notification.aconfig
@@ -284,6 +284,13 @@ flag {
}
flag {
+ name: "nm_binder_perf_cache_channels"
+ namespace: "systemui"
+ description: "Use IpcDataCache for notification channel/group lookups"
+ bug: "362981561"
+}
+
+flag {
name: "no_sbnholder"
namespace: "systemui"
description: "removes sbnholder from NLS"
diff --git a/services/core/java/com/android/server/notification/flags.aconfig b/services/core/java/com/android/server/notification/flags.aconfig
index f79d9ef174ea..65a38ae1fcde 100644
--- a/services/core/java/com/android/server/notification/flags.aconfig
+++ b/services/core/java/com/android/server/notification/flags.aconfig
@@ -123,13 +123,6 @@ flag {
}
flag {
- name: "use_ipcdatacache_channels"
- namespace: "systemui"
- description: "Adds an IPCDataCache for notification channel/group lookups"
- bug: "331677193"
-}
-
-flag {
name: "use_ssm_user_switch_signal"
namespace: "systemui"
description: "This flag controls which signal is used to handle a user switch system event"