Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 198297b4 authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

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

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

Merge commit 'f01a8730' into gingerbread-plus-aosp

* commit 'f01a8730':
  Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
parents b4a28f24 f01a8730

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

+1 −1
Original line number Diff line number Diff line
@@ -2105,6 +2105,7 @@ 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);

    }
@@ -2128,7 +2129,6 @@ 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)) {