From 3840ec8f595b2fdffc63b73d4c6ea0eeb3ab78ff Mon Sep 17 00:00:00 2001
From: Zekan Qian <pierreqian@google.com>
Date: Tue, 1 Nov 2022 09:43:45 +0800
Subject: [PATCH] Fix test failure.

Use context as fallback when application context is not available

Bug: 256581743
Test: RunSettingsRoboTests
Change-Id: Ifdc37ce2e353ba1433492e8b8e4395a16407b0bb
---
 .../android/settingslib/spa/framework/common/SpaEnvironment.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 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
index 60734254a58bd..b83104360260b 100644
--- 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