diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-09-28 23:07:26 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2010-09-28 23:07:26 -0400 |
| commit | 4da4827504df019d4e64dd864f70526ff6d384a0 (patch) | |
| tree | 9f113536e7ece08989b6df693a0078dc8147cbe6 /services | |
| parent | 3e94b94f56888acbd1f8deb23c05474baaf4fae3 (diff) | |
| download | frameworks_base-4da4827504df019d4e64dd864f70526ff6d384a0.zip frameworks_base-4da4827504df019d4e64dd864f70526ff6d384a0.tar.gz frameworks_base-4da4827504df019d4e64dd864f70526ff6d384a0.tar.bz2 | |
Revert "Check for the DEVICE_POWER permission in userActivity."
The change broke SetupWizard and probably other apps
This reverts commit 059f8f93e6e89f80dfb85cfdbcd3bce64c7b1e2c.
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 71105f1..5d32b74 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -2105,7 +2105,6 @@ 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); } @@ -2129,6 +2128,7 @@ 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)) { |