Merge "Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"" into sc-v2-dev (57919fbc) · Commits · e / os / android_packages_apps_Settings

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -361,8 +361,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
		final String stateString;
		final String footerString;

		if (!mBatteryOptimizeUtils.isValidPackageName()
		\|\| mBatteryOptimizeUtils.isAllowlistedExceptIdleApp()) {
		if (!mBatteryOptimizeUtils.isValidPackageName()) {
		// Present optimized only string when the package name is invalid or
		// it's in allow list not idle app.
		stateString = context.getString(R.string.manager_battery_usage_optimized_only);

+9 −8

Original line number	Diff line number	Diff line
		@@ -89,8 +89,16 @@ public class BatteryOptimizeUtils {
		return getAppOptimizationMode(mMode, mAllowListed);
		}

		/** Sets the {@link OptimizationMode} for associated app. */
		public void setAppOptimizationMode(@OptimizationMode int mode) {
		try {
		setAppUsageStateInternal(mode);
		} catch (Exception e) {
		Log.e(TAG, "setAppUsageState() is failed for " + mPackageName, e);
		}
		}

		/** Sets the {@link OptimizationMode} for associated app. */
		public void setAppUsageStateInternal(@OptimizationMode int mode) {
		if (getAppOptimizationMode(mMode, mAllowListed) == mode) {
		Log.w(TAG, "set the same optimization mode for: " + mPackageName);
		return;
		@@ -130,13 +138,6 @@ public class BatteryOptimizeUtils {
		\|\| mPowerAllowListBackend.isDefaultActiveApp(mPackageName);
		}

		/**
		* Return {@code true} if this package is in allow list except idle app.
		*/
		public boolean isAllowlistedExceptIdleApp() {
		return mPowerAllowListBackend.isAllowlistedExceptIdle(mPackageName);
		}

		String getPackageName() {
		return mPackageName == null ? UNKNOWN_PACKAGE : mPackageName;
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -57,10 +57,6 @@ public class OptimizedPreferenceController extends AbstractPreferenceController
		Log.d(TAG, "is system or default app, disable pref");
		((RadioButtonPreference) preference).setChecked(false);
		preference.setEnabled(false);
		} else if (mBatteryOptimizeUtils.isAllowlistedExceptIdleApp()) {
		Log.d(TAG, "in allow list not idle app, optimized states only");
		preference.setEnabled(true);
		((RadioButtonPreference) preference).setChecked(true);
		} else if (mBatteryOptimizeUtils.getAppOptimizationMode()
		== BatteryOptimizeUtils.MODE_OPTIMIZED) {
		Log.d(TAG, "is optimized states");

+0 −3

Original line number	Diff line number	Diff line
		@@ -55,9 +55,6 @@ public class RestrictedPreferenceController extends AbstractPreferenceController
		Log.d(TAG, "is system or default app, disable pref");
		((RadioButtonPreference) preference).setChecked(false);
		preference.setEnabled(false);
		} else if (mBatteryOptimizeUtils.isAllowlistedExceptIdleApp()) {
		Log.d(TAG, "in allow list not idle app, disable perf");
		preference.setEnabled(false);
		} else if (mBatteryOptimizeUtils.getAppOptimizationMode()
		== BatteryOptimizeUtils.MODE_RESTRICTED) {
		Log.d(TAG, "is restricted states");

+0 −3

Original line number	Diff line number	Diff line
		@@ -53,9 +53,6 @@ public class UnrestrictedPreferenceController extends AbstractPreferenceControll
		if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {
		Log.d(TAG, "is system or default app, unrestricted states only");
		((RadioButtonPreference) preference).setChecked(true);
		} else if (mBatteryOptimizeUtils.isAllowlistedExceptIdleApp()) {
		Log.d(TAG, "in allow list not idle app, disable perf");
		preference.setEnabled(false);
		} else if (mBatteryOptimizeUtils.getAppOptimizationMode()
		== BatteryOptimizeUtils.MODE_UNRESTRICTED) {
		Log.d(TAG, "is unrestricted states");