commit f0afd8c14e193025d8c31d2221b0904035a0d888
author Alison Cichowlas <asc@google.com> Mon Jul 31 11:24:34 2017 -0400
committer Alison Cichowlas <asc@google.com> Mon Jul 31 16:13:54 2017 -0400
tree 14e0e6d8c9053e4e8162680943eb93d0c7a89cf1
parent f98facc3b82ea45209831aa7ecdb6155b6744b57

Move ShutdownThread calls to system ui thread.

Test: Manual
Fixes: 63680790

Change-Id: I6e431efb7594ba86311aac857dbf3970d48044ac

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index a902a19..35062c1 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -34,6 +34,7 @@
 import android.os.FileUtils;
 import android.os.IIncidentManager;
 import android.os.Looper;
+import android.os.Message;
 import android.os.PowerManager;
 import android.os.Process;
 import android.os.RemoteException;
@@ -472,7 +473,20 @@
                     }
                 }
             }
-            ShutdownThread.rebootOrShutdown(null, reboot, reason);
+            Runnable runnable = new Runnable() {
+                @Override
+                public void run() {
+                    synchronized (this) {
+                        ShutdownThread.rebootOrShutdown(null, reboot, reason);
+                    }
+                }
+            };
+
+            // ShutdownThread must run on a looper capable of displaying the UI.
+            Message msg = Message.obtain(UiThread.getHandler(), runnable);
+            msg.setAsynchronous(true);
+            UiThread.getHandler().sendMessage(msg);
+
         }
     }