From 511b67e0b8b4cd06e54f5733f04eb1a7562f17ef Mon Sep 17 00:00:00 2001 From: mxyyiyi Date: Mon, 19 Aug 2024 14:17:30 +0800 Subject: [PATCH] Get the application context and pass into to a background executor. Bug: 360260798 Test: manual Flag: EXEMPT bug fix Change-Id: I77bf9a7be75257be7871714afaf1fba81787f8b1 --- .../settings/fuelgauge/AdvancedPowerUsageDetail.java | 5 +++-- .../settings/fuelgauge/PowerBackgroundUsageDetail.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index 7bbb06a2d30..e922f7058be 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -278,16 +278,17 @@ public class AdvancedPowerUsageDetail extends DashboardFragment super.onPause(); final int currentOptimizeMode = mBatteryOptimizeUtils.getAppOptimizationMode(); + final Context applicationContext = requireContext().getApplicationContext(); mLogStringBuilder.append(", onPause mode = ").append(currentOptimizeMode); logMetricCategory(currentOptimizeMode); mExecutor.execute( () -> { if (currentOptimizeMode != mOptimizationMode) { AppOptModeSharedPreferencesUtils.deleteAppOptimizationModeEventByUid( - getContext(), mBatteryOptimizeUtils.getUid()); + applicationContext, mBatteryOptimizeUtils.getUid()); } BatteryOptimizeLogUtils.writeLog( - getContext().getApplicationContext(), + applicationContext, Action.LEAVE, BatteryOptimizeLogUtils.getPackageNameWithUserId( mBatteryOptimizeUtils.getPackageName(), UserHandle.myUserId()), diff --git a/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java b/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java index 2d2c838bc36..e59cc4add46 100644 --- a/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java @@ -117,17 +117,17 @@ public class PowerBackgroundUsageDetail extends DashboardFragment super.onPause(); final int currentOptimizeMode = mBatteryOptimizeUtils.getAppOptimizationMode(); + final Context applicationContext = requireContext().getApplicationContext(); mLogStringBuilder.append(", onPause mode = ").append(currentOptimizeMode); logMetricCategory(currentOptimizeMode); - mExecutor.execute( () -> { if (currentOptimizeMode != mOptimizationMode) { AppOptModeSharedPreferencesUtils.deleteAppOptimizationModeEventByUid( - getContext(), mBatteryOptimizeUtils.getUid()); + applicationContext, mBatteryOptimizeUtils.getUid()); } BatteryOptimizeLogUtils.writeLog( - getContext().getApplicationContext(), + applicationContext, Action.LEAVE, BatteryOptimizeLogUtils.getPackageNameWithUserId( mBatteryOptimizeUtils.getPackageName(), UserHandle.myUserId()),