summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorFabian Kozynski <kozynski@google.com>2020-07-23 13:45:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-23 13:45:26 +0000
commit9a85dc9c0a75ff0bb210db9b0712786b57ac5c61 (patch)
tree3cf04eb87ffdc39b98303e65a2a5deb3cb6cada7 /core/java
parent79b877fb4c00a79c69cd7e9c3c8b2531738789a7 (diff)
parentfd89d72b13e23087fabdfeddb99d9d97727dd785 (diff)
Merge changes from topic "permission_chip" into rvc-qpr-dev
* changes: Restricts notified app ops based on flags Add back privacy chip
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
index d238d0eb916d..ea3d2de13ce6 100644
--- a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
+++ b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
@@ -120,6 +120,13 @@ public final class SystemUiDeviceConfigFlags {
*/
public static final String HASH_SALT_MAX_DAYS = "hash_salt_max_days";
+ // Flag related to Privacy Indicators
+
+ /**
+ * Whether the Permissions Hub is showing.
+ */
+ public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_2_enabled";
+
// Flags related to Assistant
/**