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

Commit 44407507 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Catalyst] Provide context for PreferenceLifecycleProvider.onActivityResult" into main

parents 45e04004 1886f15c

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

+6 −1
Original line number Diff line number Diff line
@@ -123,7 +123,12 @@ interface PreferenceLifecycleProvider { 
     *

     * @return true if the result is handled

     */

    fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean = false

    fun onActivityResult(

        context: PreferenceLifecycleContext,

        requestCode: Int,

        resultCode: Int,

        data: Intent?,

    ): Boolean = false

}



/**

packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt

+2 −2
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ class PreferenceScreenBindingHelper( 
    }



    fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

        for (preference in lifecycleAwarePreferences) {

            if (preference.onActivityResult(requestCode, resultCode, data)) break

        lifecycleAwarePreferences.firstOrNull {

            it.onActivityResult(preferenceLifecycleContext, requestCode, resultCode, data)

        }

    }