diff options
| author | Ajay Nandakumar <anandakumarm@nvidia.com> | 2013-04-25 14:12:29 +0530 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2014-03-28 11:50:30 -0700 |
| commit | 091547ff6e14973d66c58505c71964d7560de596 (patch) | |
| tree | 21121ed4023fbc536cdafd74aaf5b6c2703fe08f /kernel | |
| parent | d03b36cd186ed1fd769d2a83155cceb4e7d67ed3 (diff) | |
Revert "PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlock"
This reverts commit 11388c87d2abca1f01975ced28ce9eacea239104.
The issue is that no wake lock is held at the user space i.e by Power
Manager service.This is because the PowerManagerService fails to
acquire the Wakelock.In 3.8 the wakelock module in the kernel expects
the user process to have the capability of CAP_BLOCK_SUSPEND.Which the
powermangersevice does not have.
Bug 1274297
Bug 1384311
Change-Id: I3b696108d47278cf40abce8d5a9bd012f98f2925
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
(cherry picked from commit e8464e785027a15279a13e6e32cd1aecd22d5a00)
Reviewed-on: http://git-master/r/282698
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/wakelock.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/kernel/power/wakelock.c b/kernel/power/wakelock.c index 8f50de394d2..c8fba338007 100644 --- a/kernel/power/wakelock.c +++ b/kernel/power/wakelock.c @@ -9,7 +9,6 @@ * manipulate wakelocks on Android. */ -#include <linux/capability.h> #include <linux/ctype.h> #include <linux/device.h> #include <linux/err.h> @@ -189,9 +188,6 @@ int pm_wake_lock(const char *buf) size_t len; int ret = 0; - if (!capable(CAP_BLOCK_SUSPEND)) - return -EPERM; - while (*str && !isspace(*str)) str++; @@ -235,9 +231,6 @@ int pm_wake_unlock(const char *buf) size_t len; int ret = 0; - if (!capable(CAP_BLOCK_SUSPEND)) - return -EPERM; - len = strlen(buf); if (!len) return -EINVAL; |