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

am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread

Browse Source 
Merge commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845' into gingerbread-plus-aosp

* commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845':
  Revert "Check for the DEVICE_POWER permission in userActivity."
This commit is contained in:
Mike Lockwood
2010-09-28 20:18:36 -07:00
committed by Android Git Automerger
parent ebfe5632db a25eabad23
commit 05e1105061
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/PowerManagerService.java
View File

@@ -2105,7 +2105,6 @@ class PowerManagerService extends IPowerManager.Stub
}
public void userActivity(long time, boolean noChangeLights) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);
userActivity(time, -1, noChangeLights, OTHER_EVENT, false);
}
@@ -2129,6 +2128,7 @@ class PowerManagerService extends IPowerManager.Stub
private void userActivity(long time, long timeoutOverride, boolean noChangeLights,
int eventType, boolean force) {
//mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);
if (((mPokey & POKE_LOCK_IGNORE_CHEEK_EVENTS) != 0)
&& (eventType == CHEEK_EVENT || eventType == TOUCH_EVENT)) {