diff options
| author | John Spurlock <jspurlock@google.com> | 2015-04-30 12:47:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-30 12:47:20 +0000 |
| commit | df7f02b6e098dbcda6a6d52252c31ee2e02d8e00 (patch) | |
| tree | 7c2b68e5cbade523fbffc9164415c8f65c9ec0ca /services/java | |
| parent | 5a63f6c222874109ddbf4d9732d911532e0fea0c (diff) | |
| parent | ad61b8336aa9627a6ae19580bbdc370dc8bd6810 (diff) | |
| download | frameworks_base-df7f02b6e098dbcda6a6d52252c31ee2e02d8e00.zip frameworks_base-df7f02b6e098dbcda6a6d52252c31ee2e02d8e00.tar.gz frameworks_base-df7f02b6e098dbcda6a6d52252c31ee2e02d8e00.tar.bz2 | |
am ad61b833: Merge "Fix no vibration during shutdown."
* commit 'ad61b8336aa9627a6ae19580bbdc370dc8bd6810':
Fix no vibration during shutdown.
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 2922130..958bec4 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -285,7 +285,7 @@ public final class SystemServer { reason = null; } - ShutdownThread.rebootOrShutdown(reboot, reason); + ShutdownThread.rebootOrShutdown(null, reboot, reason); } } |