diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-28 17:22:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 17:22:09 -0700 |
| commit | f5bdeba197aba659e2dd3849a5bdfba8826c036d (patch) | |
| tree | 35b35a0328f7587a324fbc62207b98a08b391d8f /services | |
| parent | 08a02039ee467b3ead2c2e6d3f687b9c70c7fbc8 (diff) | |
| parent | ea2cf2f936b03f1720bc43863e41c89ea2a7903a (diff) | |
| download | frameworks_base-f5bdeba197aba659e2dd3849a5bdfba8826c036d.zip frameworks_base-f5bdeba197aba659e2dd3849a5bdfba8826c036d.tar.gz frameworks_base-f5bdeba197aba659e2dd3849a5bdfba8826c036d.tar.bz2 | |
am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread
Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp
* commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a':
Check for the DEVICE_POWER permission in userActivity.
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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)) { |