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

Commit 2218f6c2 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #6111771: Run-time Restart observed when signing in with an...

Merge "Fix issue #6111771: Run-time Restart observed when signing in with an existing account" into jb-dev
parents 53fadc59 56385cc4
Loading
Loading
Loading
Loading
+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();
        }