diff options
| author | Hui Yu <huiyu@google.com> | 2021-09-25 02:17:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-25 02:17:35 +0000 |
| commit | 7ce5b0bd005fb57c41cfaf9a6c4ef6fb1460383e (patch) | |
| tree | 669ab72ce931cd00160683c6926c26c2096483f3 /apex | |
| parent | a401999f857e6f12833d72974c7e2a176bee0812 (diff) | |
| parent | add3a2e3613056bbb990156bbe0d7e1ed234c439 (diff) | |
Merge "tempAllowList duration can be updated if an UID is already temp allowlisted." into sc-qpr1-dev am: add3a2e361
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15851148
Change-Id: I98beccce014373f5ccb43e76c7e6acfc76407301
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java index 9eb7bb7149ef..84d05c8b4144 100644 --- a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java +++ b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java @@ -2918,6 +2918,13 @@ public class DeviceIdleController extends SystemService reasonCode, reason).sendToTarget(); } reportTempWhitelistChangedLocked(uid, true); + } else { + // The uid is already temp allowlisted, only need to update AMS for temp allowlist + // duration. + if (mLocalActivityManager != null) { + mLocalActivityManager.updateDeviceIdleTempAllowlist(null, uid, true, + duration, tempAllowListType, reasonCode, reason, callingUid); + } } } if (informWhitelistChanged) { |