Skip to content

Commit 56385cc

Browse files
author
Dianne Hackborn
committed
Fix issue #6111771: Run-time Restart observed when signing in with an existing account
Change-Id: Ic6defb598cb08f2728d99eed7d0b209c88dd1a49
1 parent 3ea8761 commit 56385cc

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8050,8 +8050,10 @@ public void run() {
80508050
}
80518051
};
80528052

8053-
if (process == null || process.pid == MY_PID) {
8054-
worker.run(); // We may be about to die -- need to run this synchronously
8053+
if (process == null) {
8054+
// If process is null, we are being called from some internal code
8055+
// and may be about to die -- run this synchronously.
8056+
worker.run();
80558057
} else {
80568058
worker.start();
80578059
}

0 commit comments

Comments
 (0)