[Catalyst] Provide context for PreferenceLifecycleProvider.onActivityResult
Bug: 332201912
Flag: EXEMPT library
Test: N/A
Change-Id: Icbf5d45f1e1405a1daedfc17fe5f472500cb093e
diff --git a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceStateProviders.kt b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceStateProviders.kt
index 366d54b..7436ac1 100644
--- a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceStateProviders.kt
+++ b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceStateProviders.kt
@@ -123,7 +123,12 @@
*
* @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
}
/**
diff --git a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt
index 153089e..03b225e 100644
--- a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt
+++ b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt
@@ -194,8 +194,8 @@
}
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)
}
}