summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2018-06-05 01:29:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-06-05 01:29:48 +0000
commit205a5581ae0a3a5cf70ce8fe8bc752de5e58f696 (patch)
tree628403739554f60f9deeff1e46ac0411f3d6b2d8 /core/java/android
parentc1203d6a96211e87823064fa0d5988088b069067 (diff)
parentaf8ff4f2afdfa1acfc7acf73f934434cac97b7a3 (diff)
Merge "Allow except-idle whitelisted apps to start BG services in EBS" into pi-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/ActivityManagerInternal.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java
index 7338bfea9d4d..1d5f49a879d5 100644
--- a/core/java/android/app/ActivityManagerInternal.java
+++ b/core/java/android/app/ActivityManagerInternal.java
@@ -207,7 +207,7 @@ public abstract class ActivityManagerInternal {
/**
* Allow DeviceIdleController to tell us about what apps are whitelisted.
*/
- public abstract void setDeviceIdleWhitelist(int[] appids);
+ public abstract void setDeviceIdleWhitelist(int[] allAppids, int[] exceptIdleAppids);
/**
* Update information about which app IDs are on the temp whitelist.