commit 4c1b702c4f76924280116a57dc691864a2004e37
author Zekan Qian <pierreqian@google.com> Fri Oct 28 14:56:57 2022 +0800
committer Zekan Qian <pierreqian@google.com> Mon Oct 31 09:56:56 2022 +0800
tree 20ef59dbeecf947092c3eab598345d97b3f33358
parent 77e38838a448ba17d099a51f7ac0e96acf631f5e

Add Context in SpaEnvironment

Bug: 244122804
Test: manual - build Settings
Change-Id: I92b0e69a880d280776ab7f482aad3e06c72c3c03

src/com/android/settings/SettingsApplication.java

diff --git a/src/com/android/settings/SettingsApplication.java b/src/com/android/settings/SettingsApplication.java
index e5e6fcb..9c37d55 100644
--- a/src/com/android/settings/SettingsApplication.java
+++ b/src/com/android/settings/SettingsApplication.java
@@ -61,7 +61,7 @@
      * Override this function to set different spa environment for different Settings app.
      */
     protected void setSpaEnvironment() {
-        SpaEnvironmentFactory.INSTANCE.reset(new SettingsSpaEnvironment());
+        SpaEnvironmentFactory.INSTANCE.reset(new SettingsSpaEnvironment(this));
     }
 
     public void setHomeActivity(SettingsHomepageActivity homeActivity) {

src/com/android/settings/spa/SettingsSpaEnvironment.kt

diff --git a/src/com/android/settings/spa/SettingsSpaEnvironment.kt b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
index 82cc705..5131dde 100644
--- a/src/com/android/settings/spa/SettingsSpaEnvironment.kt
+++ b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
@@ -16,6 +16,7 @@
 
 package com.android.settings.spa
 
+import android.content.Context
 import com.android.settings.spa.app.AllAppListPageProvider
 import com.android.settings.spa.app.AppsMainPageProvider
 import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
@@ -36,7 +37,7 @@
 import com.android.settingslib.spa.framework.common.SpaEnvironment
 import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListTemplate
 
-open class SettingsSpaEnvironment : SpaEnvironment() {
+open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) {
     override val pageProviderRepository = lazy {
         val togglePermissionAppListTemplate = TogglePermissionAppListTemplate(
             allProviders = listOf(