summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Richard MacGregor <rmacgregor@google.com> 2023-12-20 01:29:05 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-12-20 01:29:05 +0000
commitebcecf6ff6fd4fdcf64a26b31db30a4db0f0d4cf (patch)
treef2b4b2e7a0915847d688fb5f267742488fb971b7
parentbb4db1a7c6ccf5b9acb6a84dda0aa69d2833e9b2 (diff)
parente6bf64cb6059fe48c4184dc758e3e4463d8c077c (diff)
Merge changes I1738b2c4,I9a1dfab7 into main
* changes: Add sensitive notification app protections flag Add notification protections flag
-rw-r--r--packages/SystemUI/aconfig/systemui.aconfig8
-rw-r--r--services/core/java/com/android/server/notification/flags.aconfig9
2 files changed, 17 insertions, 0 deletions
diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig
index b4c3850c30d2..782b850a5c0c 100644
--- a/packages/SystemUI/aconfig/systemui.aconfig
+++ b/packages/SystemUI/aconfig/systemui.aconfig
@@ -268,3 +268,11 @@ flag {
description: "Adds haptic feedback to the volume slider."
bug: "316953430"
}
+
+flag {
+ name: "screenshare_notification_hiding"
+ namespace: "systemui"
+ description: "Enable hiding of notifications during screenshare"
+ bug: "312784809"
+}
+
diff --git a/services/core/java/com/android/server/notification/flags.aconfig b/services/core/java/com/android/server/notification/flags.aconfig
index 55d8a0fd1fa1..8e79922a996a 100644
--- a/services/core/java/com/android/server/notification/flags.aconfig
+++ b/services/core/java/com/android/server/notification/flags.aconfig
@@ -41,3 +41,12 @@ flag {
description: "This flag controls the fix for notifications autogroup summary icon updates"
bug: "227693160"
}
+
+flag {
+ name: "sensitive_notification_app_protection"
+ namespace: "systemui"
+ description: "This flag controls the sensitive notification app protections while screen sharing"
+ bug: "312784351"
+ # Referenced in WM where WM starts before DeviceConfig
+ is_fixed_read_only: true
+}