Granted, ECM restricted settings should not be labeled as restricted

It is possible for an ECM restricted setting to also be granted. In this
case, the setting should be able to be toggled off, and the subheadings
should properly reflect the state.

Bug: 390196024
Test: atest RestrictedSwitchPreferenceTest
Flag: EXEMPT: minor bugfix
Change-Id: Ic2bd94bfafc1f7c39965a9818ba5484047e4d223

4 files changed, 11 insertions, 3 deletions

diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/enterprise/RestrictionsProvider.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/enterprise/RestrictionsProvider.kt
index 3309faaa8db2..3a6327962dc2 100644
--- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/enterprise/RestrictionsProvider.kt
+++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/enterprise/RestrictionsProvider.kt
@@ -32,6 +32,7 @@ import kotlinx.coroutines.flow.flowOn
 data class EnhancedConfirmation(
     val key: String,
     val packageName: String,
+    val isRestrictedSettingAllowed: Boolean?
 )
 data class Restrictions(
     val userId: Int = UserHandle.myUserId(),
@@ -92,6 +93,9 @@ internal class RestrictionsProviderImpl(
         }
 
         restrictions.enhancedConfirmation?.let { ec ->
+            if (ec.isRestrictedSettingAllowed == true) {
+                return NoRestricted
+            }
             RestrictedLockUtilsInternal
                     .checkIfRequiresEnhancedConfirmation(context, ec.key,
                         ec.packageName)
diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPage.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPage.kt
index 7466f95e3fb8..5580d2e3211b 100644
--- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPage.kt
+++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPage.kt
@@ -155,7 +155,7 @@ internal fun <T : AppRecord> TogglePermissionAppListModel<T>.TogglePermissionApp
         }
         RestrictedSwitchPreference(
             model = switchModel,
-            restrictions = getRestrictions(userId, packageName),
+            restrictions = getRestrictions(userId, packageName, isAllowed()),
             ifBlockedByAdminOverrideCheckedValueTo = switchifBlockedByAdminOverrideCheckedValueTo,
             restrictionsProviderFactory = restrictionsProviderFactory,
         )
diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppList.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppList.kt
index d2867af1eda6..771eb85ee21a 100644
--- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppList.kt
+++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppList.kt
@@ -116,12 +116,15 @@ fun <T : AppRecord> TogglePermissionAppListModel<T>.isChangeableWithSystemUidChe
 fun <T : AppRecord> TogglePermissionAppListModel<T>.getRestrictions(
     userId: Int,
     packageName: String,
+    isRestrictedSettingAllowed: Boolean?
 ) =
     Restrictions(
         userId = userId,
         keys = switchRestrictionKeys,
         enhancedConfirmation =
-            enhancedConfirmationKey?.let { key -> EnhancedConfirmation(key, packageName) },
+            enhancedConfirmationKey?.let {
+                key -> EnhancedConfirmation(key, packageName, isRestrictedSettingAllowed)
+                                         },
     )
 
 interface TogglePermissionAppListProvider {
diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppListPage.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppListPage.kt
index ec44d2af4ffa..bef2bdaaefaf 100644
--- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppListPage.kt
+++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppListPage.kt
@@ -149,13 +149,14 @@ internal class TogglePermissionInternalAppListModel<T : AppRecord>(
 
     @Composable
     fun getSummary(record: T): () -> String {
+        val allowed = listModel.isAllowed(record)
         val restrictions =
             listModel.getRestrictions(
                 userId = record.app.userId,
                 packageName = record.app.packageName,
+                allowed()
             )
         val restrictedMode by restrictionsProviderFactory.rememberRestrictedMode(restrictions)
-        val allowed = listModel.isAllowed(record)
         return RestrictedSwitchPreferenceModel.getSummary(
             context = context,
             summaryIfNoRestricted = { getSummaryIfNoRestricted(allowed()) },