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

Commit ea082976 authored by YK Hung's avatar YK Hung Committed by Automerger Merge Worker
Browse files

Merge "Move setup optimization mode to main thread" into tm-qpr-dev am: 3aca71cf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20742652



Change-Id: I78b78a50b032cacfa2ab4180e594018556d0377b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e7ec6ee0 3aca71cf

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

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 


            notifyBackupManager();

            logMetricCategory(selectedPreference);

            mBatteryOptimizeUtils.setAppUsageState(selectedPreference);

            Log.d(TAG, "Leave with mode: " + selectedPreference);

        }

    }
@@ -468,6 +467,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
        updatePreferenceState(mUnrestrictedPreference, selectedKey);

        updatePreferenceState(mOptimizePreference, selectedKey);

        updatePreferenceState(mRestrictedPreference, selectedKey);

	mBatteryOptimizeUtils.setAppUsageState(getSelectedPreference());

    }



    private void updatePreferenceState(SelectorWithWidgetPreference preference,

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

+1 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.content.pm.IPackageManager; 
import android.content.pm.PackageManager;

import android.content.pm.ParceledListSlice;

import android.content.pm.UserInfo;

import android.os.AsyncTask;

import android.os.UserHandle;

import android.os.UserManager;

import android.util.ArraySet;
@@ -222,10 +221,8 @@ public class BatteryOptimizeUtils { 
                mode == MODE_RESTRICTED ? AppOpsManager.MODE_IGNORED : AppOpsManager.MODE_ALLOWED;

        final boolean allowListed = mode == MODE_UNRESTRICTED;



        AsyncTask.execute(() -> {

        setAppOptimizationModeInternal(appOpsManagerMode, allowListed, uid, packageName,

                    batteryUtils, powerAllowlistBackend);

        });

    }



    private static void setAppOptimizationModeInternal(