diff options
| author | John Spurlock <jspurlock@google.com> | 2015-04-30 12:22:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-30 12:22:41 +0000 |
| commit | ad61b8336aa9627a6ae19580bbdc370dc8bd6810 (patch) | |
| tree | 51bfd98be0d8c17300f533c8d3a2044213081140 /services/java | |
| parent | 815d9bb178a0488ed1579cd230d447630ad0891b (diff) | |
| parent | d3b371755df509cabbc5b4451df83309be5439b0 (diff) | |
| download | frameworks_base-ad61b8336aa9627a6ae19580bbdc370dc8bd6810.zip frameworks_base-ad61b8336aa9627a6ae19580bbdc370dc8bd6810.tar.gz frameworks_base-ad61b8336aa9627a6ae19580bbdc370dc8bd6810.tar.bz2 | |
Merge "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 7871147..fa12d5f 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -288,7 +288,7 @@ public final class SystemServer { reason = null; } - ShutdownThread.rebootOrShutdown(reboot, reason); + ShutdownThread.rebootOrShutdown(null, reboot, reason); } } |