commit a25eabad23d7b8fd430ada757ae4e9f2559f8845
author Mike Lockwood <lockwood@android.com> Tue Sep 28 20:15:55 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 28 20:15:55 2010 -0700
tree 09dd4bf4d772fd851559fb7c9ddccab72ac4126c
parent e006e4d2c91c50795df0a02366b31610b4e97cb1
parent 4da4827504df019d4e64dd864f70526ff6d384a0

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

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 71105f1..5d32b74 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -2105,7 +2105,6 @@
     }
 
     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 @@
 
     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)) {