diff options
| author | Jim Miller <jaggies@google.com> | 2015-07-15 14:33:10 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2015-07-15 14:33:10 -0700 |
| commit | c7b0435cc709c328da8e2b515ea04c8bc40d1094 (patch) | |
| tree | 042daa8ffa664abb32492f27ba95a27a3f70aea8 /cmds | |
| parent | 2fc3216e2f8b77116594ca5cda2e927c43094039 (diff) | |
| parent | 1d4247c4cc89c6d62e44ed3115f26579979b44b5 (diff) | |
| download | frameworks_base-c7b0435cc709c328da8e2b515ea04c8bc40d1094.zip frameworks_base-c7b0435cc709c328da8e2b515ea04c8bc40d1094.tar.gz frameworks_base-c7b0435cc709c328da8e2b515ea04c8bc40d1094.tar.bz2 | |
resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a
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 da8586c..2754f2d 100644 --- a/cmds/svc/src/com/android/commands/svc/PowerCommand.java +++ b/cmds/svc/src/com/android/commands/svc/PowerCommand.java @@ -70,7 +70,7 @@ public class PowerCommand extends Svc.Command { if (val != 0) { // if the request is not to set it to false, wake up the screen so that // it can stay on as requested - pm.wakeUp(SystemClock.uptimeMillis()); + pm.wakeUp(SystemClock.uptimeMillis(), "PowerCommand", null); } pm.setStayOnSetting(val); } |