diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-28 17:14:34 -0700 |
|---|---|---|
| committer | Joe Onorato <joeo@android.com> | 2010-09-28 17:14:34 -0700 |
| commit | 059f8f93e6e89f80dfb85cfdbcd3bce64c7b1e2c (patch) | |
| tree | 640a9017d3e59771ea2ea4990a62b913a77e1d49 /services | |
| parent | ab014a03a06a0044106ed9ad612b11e8197c8734 (diff) | |
| download | frameworks_base-059f8f93e6e89f80dfb85cfdbcd3bce64c7b1e2c.zip frameworks_base-059f8f93e6e89f80dfb85cfdbcd3bce64c7b1e2c.tar.gz frameworks_base-059f8f93e6e89f80dfb85cfdbcd3bce64c7b1e2c.tar.bz2 | |
Check for the DEVICE_POWER permission in userActivity.
Change-Id: I6c8038a960bdf32dfad3b0571d86f51f87784370
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)) { |