diff options
| author | Marco Nelissen <marcone@google.com> | 2013-10-03 15:39:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-03 15:39:18 -0700 |
| commit | d9ff894eae0b3acd3c89585a80ebd2039ed1de8c (patch) | |
| tree | 32045234c6359f831a332af2718e839c5d493c7c /services | |
| parent | 12585551f4ccf08906519b9e8e9b29a5b5de93b0 (diff) | |
| parent | 05f56fc121e176ef4e227639a7b636a875f38037 (diff) | |
| download | frameworks_base-d9ff894eae0b3acd3c89585a80ebd2039ed1de8c.zip frameworks_base-d9ff894eae0b3acd3c89585a80ebd2039ed1de8c.tar.gz frameworks_base-d9ff894eae0b3acd3c89585a80ebd2039ed1de8c.tar.bz2 | |
am 05f56fc1: am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev
* commit '05f56fc121e176ef4e227639a7b636a875f38037':
Add PowerManager method to assign blame to a single uid
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/power/PowerManagerService.java | 6 |
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) { |