Merge "Fix test failure."

2022-11-01 05:06:57 +00:00
parent 167691ce12 3840ec8f59
commit 0159fafb75
1 changed files with 2 additions and 1 deletions
--- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt
+++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt
@@ -59,7 +59,8 @@ abstract class SpaEnvironment(context: Context) {

    val entryRepository = lazy { SettingsEntryRepository(pageProviderRepository.value) }

-    val appContext: Context = context.applicationContext
+    // In Robolectric test, applicationContext is not available. Use context as fallback.
+    val appContext: Context = context.applicationContext ?: context

    open val browseActivityClass: Class<out Activity>? = null