diff options
| author | Prerepa Viswanadham <dham@google.com> | 2015-05-05 01:05:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-05 01:06:38 +0000 |
| commit | d1808401ca3bfd6b6b9a975c1e739b194d18f849 (patch) | |
| tree | 50c16a5c966772fd3b3ac4f7d2e79c97252935c7 /services/java | |
| parent | 44b60be189183138437a3faf9a73388af0efcf44 (diff) | |
| parent | 059ded5a7b7389b7eefc2502bd712228931ed107 (diff) | |
| download | frameworks_base-d1808401ca3bfd6b6b9a975c1e739b194d18f849.zip frameworks_base-d1808401ca3bfd6b6b9a975c1e739b194d18f849.tar.gz frameworks_base-d1808401ca3bfd6b6b9a975c1e739b194d18f849.tar.bz2 | |
Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
Merge commit 'b6f59f4' into master_merge
Merge commit 'f6db0ce' into master_merge
Merge commit '17455a3' into master_merge
Merge commit 'b4d5b32' into master_merge
Merge commit 'a1a2fa7' into master_merge
Merge commit '8dfdb98' into master_merge
Merge commit 'eba66c3' into master_merge
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 c1153b6..2d265e2 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -284,7 +284,7 @@ public final class SystemServer { reason = null; } - ShutdownThread.rebootOrShutdown(reboot, reason); + ShutdownThread.rebootOrShutdown(null, reboot, reason); } } |