Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bb5b8dc authored by Xinyi Mao's avatar Xinyi Mao Committed by Android (Google) Code Review
Browse files

Merge "Get the application context and pass into to a background executor." into main

parents 9f5c4f99 511b67e0

src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java

+3 −2
Original line number Diff line number Diff line
@@ -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()),

src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java

+3 −3
Original line number Diff line number Diff line
@@ -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()),