| commit | ac305cc8d4c766433475e7735d9d27476da67190 | [log] [tgz] |
|---|---|---|
| author | Chaitanya Cheemala (xWF) <ccheemala@google.com> | Mon Oct 14 15:08:45 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 14 15:08:45 2024 +0000 |
| tree | c424ab3554f198fe7f2ff00055a17904aa11264b | |
| parent | 721fb3487450319895f0c3924c4e8706939aed78 [diff] | |
| parent | 0fff46ec0d47f187f2b29cf3777be5434e90cb09 [diff] |
Merge "Revert "[Catalyst] Support settings service"" into main
diff --git a/packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt b/packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt index 8fb16d8..8c5d877 100644 --- a/packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt +++ b/packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt
@@ -78,10 +78,6 @@ for (activityClass in request.activityClasses) { add(activityClass) } - // Temporarily add all screens - for (key in PreferenceScreenRegistry.preferenceScreens.keys) { - addPreferenceScreenFromRegistry(key, Activity::class.java) - } } fun build() = builder.build()
diff --git a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenRegistry.kt b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenRegistry.kt index 6646d6c3..48798da 100644 --- a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenRegistry.kt +++ b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenRegistry.kt
@@ -34,7 +34,7 @@ ImmutableMap.of() } - val preferenceScreens: PreferenceScreenMap + private val preferenceScreens: PreferenceScreenMap get() = preferenceScreensSupplier.get() private var readWritePermitProvider: ReadWritePermitProvider? = null