Merge "Fix issue #6111771: Run-time Restart observed when signing in with an existing account" into jb-dev

Author: Dianne Hackborn

services/java/com/android/server/am/ActivityManagerService.java

@@ -8050,8 +8050,10 @@ public void run() {
             }
         };
 
-        if (process == null || process.pid == MY_PID) {
-            worker.run();  // We may be about to die -- need to run this synchronously
+        if (process == null) {
+            // If process is null, we are being called from some internal code
+            // and may be about to die -- run this synchronously.
+            worker.run();
         } else {
             worker.start();
         }