diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-09-28 20:18:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 20:18:36 -0700 |
| commit | 05e110506156a1b782232833b907afb428802b69 (patch) | |
| tree | e146d2bfb011666cc799eb8a3ba6beebabe374cc /services | |
| parent | ebfe5632db275a89b49ab828064ba90db59702cf (diff) | |
| parent | a25eabad23d7b8fd430ada757ae4e9f2559f8845 (diff) | |
| download | frameworks_base-05e110506156a1b782232833b907afb428802b69.zip frameworks_base-05e110506156a1b782232833b907afb428802b69.tar.gz frameworks_base-05e110506156a1b782232833b907afb428802b69.tar.bz2 | |
am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread
Merge commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845' into gingerbread-plus-aosp
* commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845':
Revert "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 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)) { |