Only user whitelist gets allow_while_idle_unrestricted
Due to earlier refactorings, now allow-in-power-save-except-idle apps
are getting the flag ALLOW_WHILE_IDLE_UNRESTRICTED, which should not
happen. Restricting to user whitelisted app ids as was the case in O.
Test: atest com.android.server.AppStateTrackerTest
atest android.alarmmanager.cts.AppStandbyTests
Also, manually,
adb shell cmd deviceidle whitelist +<package-name>
Then verify the app id appears in App state tracker dump in
adb shell dumpsys alarm
Bug: 74773710
Change-Id: I6fdce33446e1374c6672ce98769aa8b5844effa9
diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java
index 0775abf..f79a51b 100644
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -1776,7 +1776,7 @@
} else if (workSource == null && (callingUid < Process.FIRST_APPLICATION_UID
|| UserHandle.isSameApp(callingUid, mSystemUiUid)
|| ((mAppStateTracker != null)
- && mAppStateTracker.isUidPowerSaveWhitelisted(callingUid)))) {
+ && mAppStateTracker.isUidPowerSaveUserWhitelisted(callingUid)))) {
flags |= AlarmManager.FLAG_ALLOW_WHILE_IDLE_UNRESTRICTED;
flags &= ~AlarmManager.FLAG_ALLOW_WHILE_IDLE;
}
diff --git a/services/core/java/com/android/server/AppStateTracker.java b/services/core/java/com/android/server/AppStateTracker.java
index 9b001ce..3a7b5d6 100644
--- a/services/core/java/com/android/server/AppStateTracker.java
+++ b/services/core/java/com/android/server/AppStateTracker.java
@@ -117,6 +117,12 @@
@GuardedBy("mLock")
private int[] mPowerWhitelistedAllAppIds = new int[0];
+ /**
+ * User whitelisted apps in the device idle controller.
+ */
+ @GuardedBy("mLock")
+ private int[] mPowerWhitelistedUserAppIds = new int[0];
+
@GuardedBy("mLock")
private int[] mTempWhitelistedAppIds = mPowerWhitelistedAllAppIds;
@@ -983,13 +989,16 @@
* Called by device idle controller to update the power save whitelists.
*/
public void setPowerSaveWhitelistAppIds(
- int[] powerSaveWhitelistAllAppIdArray, int[] tempWhitelistAppIdArray) {
+ int[] powerSaveWhitelistExceptIdleAppIdArray,
+ int[] powerSaveWhitelistUserAppIdArray,
+ int[] tempWhitelistAppIdArray) {
synchronized (mLock) {
final int[] previousWhitelist = mPowerWhitelistedAllAppIds;
final int[] previousTempWhitelist = mTempWhitelistedAppIds;
- mPowerWhitelistedAllAppIds = powerSaveWhitelistAllAppIdArray;
+ mPowerWhitelistedAllAppIds = powerSaveWhitelistExceptIdleAppIdArray;
mTempWhitelistedAppIds = tempWhitelistAppIdArray;
+ mPowerWhitelistedUserAppIds = powerSaveWhitelistUserAppIdArray;
if (isAnyAppIdUnwhitelisted(previousWhitelist, mPowerWhitelistedAllAppIds)) {
mHandler.notifyAllUnwhitelisted();
@@ -1194,6 +1203,16 @@
}
/**
+ * @param uid the uid to check for
+ * @return whether a UID is in the user defined power-save whitelist or not.
+ */
+ public boolean isUidPowerSaveUserWhitelisted(int uid) {
+ synchronized (mLock) {
+ return ArrayUtils.contains(mPowerWhitelistedUserAppIds, UserHandle.getAppId(uid));
+ }
+ }
+
+ /**
* @return whether a UID is in the temp power-save whitelist or not.
*
* Note clients normally shouldn't need to access it. It's only for dumpsys.
@@ -1231,9 +1250,12 @@
pw.print("Foreground uids: ");
dumpUids(pw, mForegroundUids);
- pw.print("Whitelist appids: ");
+ pw.print("Except-idle + user whitelist appids: ");
pw.println(Arrays.toString(mPowerWhitelistedAllAppIds));
+ pw.print("User whitelist appids: ");
+ pw.println(Arrays.toString(mPowerWhitelistedUserAppIds));
+
pw.print("Temp whitelist appids: ");
pw.println(Arrays.toString(mTempWhitelistedAppIds));
@@ -1311,6 +1333,10 @@
proto.write(ForceAppStandbyTrackerProto.POWER_SAVE_WHITELIST_APP_IDS, appId);
}
+ for (int appId : mPowerWhitelistedUserAppIds) {
+ proto.write(ForceAppStandbyTrackerProto.POWER_SAVE_USER_WHITELIST_APP_IDS, appId);
+ }
+
for (int appId : mTempWhitelistedAppIds) {
proto.write(ForceAppStandbyTrackerProto.TEMP_POWER_SAVE_WHITELIST_APP_IDS, appId);
}
diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java
index 74b4543..0f4702c 100644
--- a/services/core/java/com/android/server/DeviceIdleController.java
+++ b/services/core/java/com/android/server/DeviceIdleController.java
@@ -1540,7 +1540,7 @@
mLocalActivityManager.registerScreenObserver(mScreenObserver);
- passWhiteListToForceAppStandbyTrackerLocked();
+ passWhiteListsToForceAppStandbyTrackerLocked();
updateInteractivityLocked();
}
updateConnectivityState(null);
@@ -1631,7 +1631,7 @@
mPowerSaveWhitelistAppsExceptIdle, mPowerSaveWhitelistUserApps,
mPowerSaveWhitelistExceptIdleAppIds);
- passWhiteListToForceAppStandbyTrackerLocked();
+ passWhiteListsToForceAppStandbyTrackerLocked();
}
return true;
} catch (PackageManager.NameNotFoundException e) {
@@ -1650,7 +1650,7 @@
mPowerSaveWhitelistExceptIdleAppIds);
mPowerSaveWhitelistUserAppsExceptIdle.clear();
- passWhiteListToForceAppStandbyTrackerLocked();
+ passWhiteListsToForceAppStandbyTrackerLocked();
}
}
}
@@ -2589,7 +2589,7 @@
}
mLocalPowerManager.setDeviceIdleWhitelist(mPowerSaveWhitelistAllAppIdArray);
}
- passWhiteListToForceAppStandbyTrackerLocked();
+ passWhiteListsToForceAppStandbyTrackerLocked();
}
private void updateTempWhitelistAppIdsLocked(int appId, boolean adding) {
@@ -2615,7 +2615,7 @@
}
mLocalPowerManager.setDeviceIdleTempWhitelist(mTempWhitelistAppIdArray);
}
- passWhiteListToForceAppStandbyTrackerLocked();
+ passWhiteListsToForceAppStandbyTrackerLocked();
}
private void reportPowerSaveWhitelistChangedLocked() {
@@ -2630,9 +2630,10 @@
getContext().sendBroadcastAsUser(intent, UserHandle.SYSTEM);
}
- private void passWhiteListToForceAppStandbyTrackerLocked() {
+ private void passWhiteListsToForceAppStandbyTrackerLocked() {
mAppStateTracker.setPowerSaveWhitelistAppIds(
mPowerSaveWhitelistExceptIdleAppIdArray,
+ mPowerSaveWhitelistUserAppIdArray,
mTempWhitelistAppIdArray);
}