commit 198297b495d975cd4889f5136cd69368bd319eed
author Joe Onorato <joeo@android.com> Wed Sep 29 11:02:55 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 29 11:02:55 2010 -0700
tree dd3e822c61014e0f751069a133b8c8e9a2576204
parent b4a28f24263fbccce4b77b47c2f3ddac63a8a75f
parent f01a873029641da2155ca1882f311d8f4e92675a

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

Merge commit 'f01a873029641da2155ca1882f311d8f4e92675a' into gingerbread-plus-aosp

* commit 'f01a873029641da2155ca1882f311d8f4e92675a':
  Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""

services/java/com/android/server/PowerManagerService.java

diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index 5d32b74..71105f1 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -2105,6 +2105,7 @@
     }
 
     public void userActivity(long time, boolean noChangeLights) {
+        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);
         userActivity(time, -1, noChangeLights, OTHER_EVENT, false);
     }
 
@@ -2128,7 +2129,6 @@
 
     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)) {