Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add PowerManager method to assign blame to a single uid" into klp-dev

Browse Source
This commit is contained in:
Marco Nelissen
2013-10-03 16:34:57 +00:00
committed by Android (Google) Code Review
parent 8e0ca288fe d983ba5cac
commit 95867a6524
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/IPowerManager.aidl
View File

@@ -23,9 +23,10 @@ import android.os.WorkSource;
interface IPowerManager
{
// WARNING: The first two methods must remain the first two methods because their
// WARNING: The first three methods must remain the first three methods because their
// transaction numbers must not change unless IPowerManager.cpp is also updated.
void acquireWakeLock(IBinder lock, int flags, String tag, String packageName, in WorkSource ws);
void acquireWakeLockWithUid(IBinder lock, int flags, String tag, String packageName, int uidtoblame);
void releaseWakeLock(IBinder lock, int flags);
void updateWakeLockWorkSource(IBinder lock, in WorkSource ws);

1
data/etc/platform.xml
View File

@@ -128,6 +128,7 @@
<assign-permission name="android.permission.MODIFY_AUDIO_SETTINGS" uid="media" />
<assign-permission name="android.permission.ACCESS_SURFACE_FLINGER" uid="media" />
<assign-permission name="android.permission.WAKE_LOCK" uid="media" />
<assign-permission name="android.permission.UPDATE_DEVICE_STATS" uid="media" />
<assign-permission name="android.permission.UPDATE_APP_OPS_STATS" uid="media" />
<assign-permission name="android.permission.ACCESS_SURFACE_FLINGER" uid="graphics" />

6
services/java/com/android/server/power/PowerManagerService.java
View File

@@ -579,6 +579,12 @@ public final class PowerManagerService extends IPowerManager.Stub
updatePowerStateLocked();
}
@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) {