diff --git a/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt b/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt index c4a89179b08..4587bb2b9c2 100644 --- a/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt +++ b/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt @@ -40,7 +40,6 @@ import com.android.settings.fuelgauge.batteryusage.BatteryChartPreferenceControl import com.android.settings.fuelgauge.batteryusage.BatteryDiffEntry import com.android.settingslib.spa.widget.preference.Preference import com.android.settingslib.spa.widget.preference.PreferenceModel -import com.android.settingslib.spaprivileged.framework.common.asUser import com.android.settingslib.spaprivileged.model.app.installed import com.android.settingslib.spaprivileged.model.app.userHandle import com.android.settingslib.spaprivileged.model.app.userId @@ -65,7 +64,6 @@ fun AppBatteryPreference(app: ApplicationInfo) { } private class AppBatteryPresenter(private val context: Context, private val app: ApplicationInfo) { - private val userContext = context.asUser(app.userHandle) private var batteryDiffEntryState: LoadingState by mutableStateOf(LoadingState.Loading) @@ -87,7 +85,7 @@ private class AppBatteryPresenter(private val context: Context, private val app: private suspend fun getBatteryDiffEntry(): BatteryDiffEntry? = withContext(Dispatchers.IO) { BatteryChartPreferenceController.getAppBatteryUsageData( - userContext, app.packageName, app.userId + context, app.packageName, app.userId ).also { Log.d(TAG, "loadBatteryDiffEntries():\n$it") } diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppBatteryPreferenceTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppBatteryPreferenceTest.kt index 8dd494596f0..8f1a9a20cdc 100644 --- a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppBatteryPreferenceTest.kt +++ b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppBatteryPreferenceTest.kt @@ -36,7 +36,6 @@ import com.android.settings.R import com.android.settings.fuelgauge.AdvancedPowerUsageDetail import com.android.settings.fuelgauge.batteryusage.BatteryChartPreferenceController import com.android.settings.fuelgauge.batteryusage.BatteryDiffEntry -import com.android.settings.testutils.mockAsUser import com.android.settingslib.spaprivileged.model.app.userId import org.junit.After import org.junit.Before @@ -70,7 +69,6 @@ class AppBatteryPreferenceTest { .mockStatic(AdvancedPowerUsageDetail::class.java) .strictness(Strictness.LENIENT) .startMocking() - context.mockAsUser() whenever(context.resources).thenReturn(resources) whenever(resources.getBoolean(R.bool.config_show_app_info_settings_battery)) .thenReturn(true)