summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2013-10-03 16:34:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-03 16:34:57 +0000
commit95867a652410b5f0193cf301f5737381bcbd3a88 (patch)
tree7fcd45bd88dab29be3bed57ed7e3a19e3c4cf175 /services
parent8e0ca288fe3f7bbb7d25751fa00be218b3940f18 (diff)
parentd983ba5cac232c01dff818556b57f497f7d99854 (diff)
downloadframeworks_base-95867a652410b5f0193cf301f5737381bcbd3a88.zip
frameworks_base-95867a652410b5f0193cf301f5737381bcbd3a88.tar.gz
frameworks_base-95867a652410b5f0193cf301f5737381bcbd3a88.tar.bz2
Merge "Add PowerManager method to assign blame to a single uid" into klp-dev
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/power/PowerManagerService.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java
index 2ccd21c..8fbde14 100644
--- a/services/java/com/android/server/power/PowerManagerService.java
+++ b/services/java/com/android/server/power/PowerManagerService.java
@@ -580,6 +580,12 @@ public final class PowerManagerService extends IPowerManager.Stub
}
@Override // Binder call
+ public void acquireWakeLockWithUid(IBinder lock, int flags, String tag, String packageName,
+ int uid) {
+ acquireWakeLock(lock, flags, tag, packageName, new WorkSource(uid));
+ }
+
+ @Override // Binder call
public void acquireWakeLock(IBinder lock, int flags, String tag, String packageName,
WorkSource ws) {
if (lock == null) {