[Catalyst] Support multiple restriction keys

NO_IFTTT=Catalyst only Bug: 377600992 Flag: com.android.settings.flags.catalyst Test: testdpc Change-Id: If7212b5402f7e271b7fdbd2a43bed0e11ee6f15f
2024-11-12 01:26:12 +08:00
parent a1abfdcaca
commit 865e9b29f5
11 changed files with 48 additions and 31 deletions
--- a/src/com/android/settings/restriction/UserRestrictionBindingHelper.kt
+++ b/src/com/android/settings/restriction/UserRestrictionBindingHelper.kt
@@ -34,7 +34,9 @@ class UserRestrictionBindingHelper(
                screenBindingHelper.forEachRecursively {
                    val metadata = it.metadata
                    if (metadata is PreferenceRestrictionMixin) {
-                        getOrPut(metadata.restrictionKey) { mutableSetOf() }.add(metadata.key)
+                        for (restrictionKey in metadata.restrictionKeys) {
+                            getOrPut(restrictionKey) { mutableSetOf() }.add(metadata.key)
+                        }
                    }
                }
            }