summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author YoungJoon Yang <youngjoonyang@google.com> 2024-02-08 16:56:39 +0900
committer YoungJoon Yang <youngjoonyang@google.com> 2024-02-12 23:39:19 +0000
commit6e71a0565350c0cadfda51e29657c390036efd82 (patch)
tree3d4fdfd83cd88bdfbd4b927cb6052ca955d2c35f
parent2e69617fdfa9b8ea6e95aecf4ef40fe942659f1a (diff)
Clean up wear_privacy_dashboard_enabled
since wear_privacy_dashboard_enabled_read_only was rolled out. Bug: 320702364 Test: manual test Change-Id: Ib31de06102053e3d91d1bc500b3f2776cf162d44
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsHelper.kt2
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionAppsHelper.kt4
-rw-r--r--flags/flags.aconfig8
3 files changed, 2 insertions, 12 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsHelper.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsHelper.kt
index 9fb86eaaf..9529ac83a 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsHelper.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsHelper.kt
@@ -143,7 +143,7 @@ class WearAppPermissionGroupsHelper(
val grantSummary =
getGrantSummary(category, groupUiInfo)?.let { context.getString(it) } ?: ""
val summary = StringBuilder(grantSummary)
- if (Flags.wearPrivacyDashboardEnabled() || Flags.wearPrivacyDashboardEnabledReadOnly()) {
+ if (Flags.wearPrivacyDashboardEnabledReadOnly()) {
WearUtils.getPreferenceSummary(context, lastAccessTime).let {
if (it.isNotEmpty()) {
summary.append(System.lineSeparator()).append(it)
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionAppsHelper.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionAppsHelper.kt
index 7d92d69bc..d14cdb620 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionAppsHelper.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionAppsHelper.kt
@@ -160,9 +160,7 @@ class WearPermissionAppsHelper(
)
}
val summary =
- if (
- Flags.wearPrivacyDashboardEnabled() || Flags.wearPrivacyDashboardEnabledReadOnly()
- ) {
+ if (Flags.wearPrivacyDashboardEnabledReadOnly()) {
lastAccessTime?.let { WearUtils.getPreferenceSummary(application, lastAccessTime) }
} else {
null
diff --git a/flags/flags.aconfig b/flags/flags.aconfig
index db6a1aa2e..3bec682a1 100644
--- a/flags/flags.aconfig
+++ b/flags/flags.aconfig
@@ -24,14 +24,6 @@ flag {
is_fixed_read_only: true
}
-# TODO: Remove when wear_privacy_dashboard_enabled_read_only reaches to the next stage.
-flag {
- name: "wear_privacy_dashboard_enabled"
- namespace: "wear_security"
- description: "This flag is used to support Privacy dashboard for Wear"
- bug: "309721061"
-}
-
flag {
name: "wear_privacy_dashboard_enabled_read_only"
namespace: "wear_security"