diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-09-28 20:21:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 20:21:48 -0700 |
| commit | 5d5bf48c9843231d55ded61f6ce50488ef280554 (patch) | |
| tree | ec4c59a9fa7c15f79a23d73113fcec585008b0f8 | |
| parent | d9bb688c91b5be6b7f065f02b9095787c452016e (diff) | |
| parent | 05e110506156a1b782232833b907afb428802b69 (diff) | |
| download | frameworks_base-5d5bf48c9843231d55ded61f6ce50488ef280554.zip frameworks_base-5d5bf48c9843231d55ded61f6ce50488ef280554.tar.gz frameworks_base-5d5bf48c9843231d55ded61f6ce50488ef280554.tar.bz2 | |
am 05e11050: am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread
Merge commit '05e110506156a1b782232833b907afb428802b69'
* commit '05e110506156a1b782232833b907afb428802b69':
Revert "Check for the DEVICE_POWER permission in userActivity."
| -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 4532c1c..9401ff8 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)) { |