From 4c1b702c4f76924280116a57dc691864a2004e37 Mon Sep 17 00:00:00 2001 From: Zekan Qian Date: Fri, 28 Oct 2022 14:56:57 +0800 Subject: [PATCH] Add Context in SpaEnvironment Bug: 244122804 Test: manual - build Settings Change-Id: I92b0e69a880d280776ab7f482aad3e06c72c3c03 --- src/com/android/settings/SettingsApplication.java | 2 +- src/com/android/settings/spa/SettingsSpaEnvironment.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/SettingsApplication.java b/src/com/android/settings/SettingsApplication.java index e5e6fcb9f2b..9c37d55478e 100644 --- a/src/com/android/settings/SettingsApplication.java +++ b/src/com/android/settings/SettingsApplication.java @@ -61,7 +61,7 @@ public class SettingsApplication extends Application { * 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) { diff --git a/src/com/android/settings/spa/SettingsSpaEnvironment.kt b/src/com/android/settings/spa/SettingsSpaEnvironment.kt index 82cc705b767..5131dde7b59 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.SettingsPageProviderReposito 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(