Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 870fb0c4 authored by Chris Antol's avatar Chris Antol Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "[Catalyst] Support settings service"" into main

parents 2be1c838 d2227263

packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ private constructor(private val context: Context, private val request: GetPrefer 
        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()

packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceScreenRegistry.kt

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ object PreferenceScreenRegistry : ReadWritePermitProvider { 
        ImmutableMap.of()

    }



    private val preferenceScreens: PreferenceScreenMap

    val preferenceScreens: PreferenceScreenMap

        get() = preferenceScreensSupplier.get()



    private var readWritePermitProvider: ReadWritePermitProvider? = null