diff options
| author | Karishma Vakil <kvakil@google.com> | 2023-04-14 16:37:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-04-14 16:37:09 +0000 |
| commit | b5f7f66e290cc525011171e148766cc69879ef1c (patch) | |
| tree | 79fb3a17414fd16086ff1402f16091f28d717039 | |
| parent | be3adbb7aac51d9776e2bb5e5351b5aa0b996bd9 (diff) | |
| parent | eb6312db5b5703bd989fa708b74551cb95e06a68 (diff) | |
| download | Permission-b5f7f66e290cc525011171e148766cc69879ef1c.tar.gz | |
Merge "[Safety Labels] Change safety label feature flags to be default on" into udc-dev
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt b/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt index a9d8c4e12..2939a9cff 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt @@ -282,7 +282,7 @@ object KotlinUtils { @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.UPSIDE_DOWN_CAKE, codename = "UpsideDownCake") fun isPermissionRationaleEnabled(): Boolean { return SdkLevel.isAtLeastU() && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY, - PERMISSION_RATIONALE_ENABLED, false) + PERMISSION_RATIONALE_ENABLED, true) } /** @@ -291,7 +291,7 @@ object KotlinUtils { @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.UPSIDE_DOWN_CAKE, codename = "UpsideDownCake") fun isSafetyLabelChangeNotificationsEnabled(): Boolean { return SdkLevel.isAtLeastU() && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY, - SAFETY_LABEL_CHANGE_NOTIFICATIONS_ENABLED, false) + SAFETY_LABEL_CHANGE_NOTIFICATIONS_ENABLED, true) } /** |