Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f823a76d authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 2218f6c2: Merge "Fix issue #6111771: Run-time Restart observed when signing... 

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

* commit '2218f6c2':
  Fix issue #6111771: Run-time Restart observed when signing in with an existing account
parents ac3f02ab 2218f6c2

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

+4 −2
Original line number Diff line number Diff line
@@ -8050,8 +8050,10 @@ public final class ActivityManagerService extends ActivityManagerNative 
            }

        };













        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();















        }