diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-13 16:02:57 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-09-13 16:56:10 -0700 |
| commit | e746f03c6c8b8d0897d322ab524d545ace200fcd (patch) | |
| tree | c994b35c248fe2f75bbb4060b1441289a9cca292 /cmds | |
| parent | 1510770165b7bc675e5171560e907c0269dbe0fa (diff) | |
| parent | 53686433a9790bcfe7211a661b26783ee12bb436 (diff) | |
| download | frameworks_base-e746f03c6c8b8d0897d322ab524d545ace200fcd.zip frameworks_base-e746f03c6c8b8d0897d322ab524d545ace200fcd.tar.gz frameworks_base-e746f03c6c8b8d0897d322ab524d545ace200fcd.tar.bz2 | |
resolved conflicts for merge of 53686433 to master
Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/svc/src/com/android/commands/svc/PowerCommand.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/svc/src/com/android/commands/svc/PowerCommand.java b/cmds/svc/src/com/android/commands/svc/PowerCommand.java index d3ec3d9..e1d6619 100644 --- a/cmds/svc/src/com/android/commands/svc/PowerCommand.java +++ b/cmds/svc/src/com/android/commands/svc/PowerCommand.java @@ -64,7 +64,7 @@ public class PowerCommand extends Svc.Command { = IPowerManager.Stub.asInterface(ServiceManager.getService(Context.POWER_SERVICE)); try { IBinder lock = new Binder(); - pm.acquireWakeLock(PowerManager.FULL_WAKE_LOCK, lock, "svc power"); + pm.acquireWakeLock(PowerManager.FULL_WAKE_LOCK, lock, "svc power", null); pm.setStayOnSetting(val); pm.releaseWakeLock(lock, 0); } |