diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-29 10:20:59 -0700 |
|---|---|---|
| committer | Joe Onorato <joeo@android.com> | 2010-09-29 10:20:59 -0700 |
| commit | 0c32c09cd3a99a7f397313048ecf9d4c5afaaa91 (patch) | |
| tree | b7832ebcdc5f0af9d1c20236638106f93f0d4d79 /services/java | |
| parent | 212d81a004f50e51ed8f6d803b79f4b71546b351 (diff) | |
| download | frameworks_base-0c32c09cd3a99a7f397313048ecf9d4c5afaaa91.zip frameworks_base-0c32c09cd3a99a7f397313048ecf9d4c5afaaa91.tar.gz frameworks_base-0c32c09cd3a99a7f397313048ecf9d4c5afaaa91.tar.bz2 | |
Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
This reverts commit 4da4827504df019d4e64dd864f70526ff6d384a0.
Diffstat (limited to 'services/java')
| -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)) { |