Merge "Use "except-idle" whitelist for force-app-standby" (c87b54a5) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/DeviceIdleController.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -1591,6 +1591,8 @@ public class DeviceIdleController extends SystemService
		mPowerSaveWhitelistExceptIdleAppIdArray = buildAppIdArray(
		mPowerSaveWhitelistAppsExceptIdle, mPowerSaveWhitelistUserApps,
		mPowerSaveWhitelistExceptIdleAppIds);

		passWhiteListToForceAppStandbyTrackerLocked();
		}
		return true;
		} catch (PackageManager.NameNotFoundException e) {
		@@ -1608,6 +1610,8 @@ public class DeviceIdleController extends SystemService
		mPowerSaveWhitelistAppsExceptIdle, mPowerSaveWhitelistUserApps,
		mPowerSaveWhitelistExceptIdleAppIds);
		mPowerSaveWhitelistUserAppsExceptIdle.clear();

		passWhiteListToForceAppStandbyTrackerLocked();
		}
		}
		}
		@@ -2572,7 +2576,7 @@ public class DeviceIdleController extends SystemService

		private void passWhiteListToForceAppStandbyTrackerLocked() {
		ForceAppStandbyTracker.getInstance(getContext()).setPowerSaveWhitelistAppIds(
		mPowerSaveWhitelistAllAppIdArray,
		mPowerSaveWhitelistExceptIdleAppIdArray,
		mTempWhitelistAppIdArray);
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,9 @@ public class ForceAppStandbyTracker {
		@GuardedBy("mLock")
		final SparseBooleanArray mForegroundUids = new SparseBooleanArray();

		/**
		* System except-idle + user whitelist in the device idle controller.
		*/
		@GuardedBy("mLock")
		private int[] mPowerWhitelistedAllAppIds = new int[0];