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

Commit 62b21c69 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Merge commit 'bc52ca28'"

parents f0f1955c 69ccdbd7
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -904,10 +904,15 @@ public final class ActivityManagerService extends ActivityManagerNative
                            null, null, 0, null, null, null,
                            false, false, MY_PID, Process.SYSTEM_UID, 0 /* TODO: Verify */);
                    if (mShowDialogs) {
                        Dialog d = new AppNotRespondingDialog(ActivityManagerService.this,
                                mContext, proc, (ActivityRecord)data.get("activity"));
                        d.show();
                        proc.anrDialog = d;
                    } else {
                        // Just kill the app if there is no dialog to be shown.
                        killAppAtUsersRequest(proc, null);
                    }
                }
                
                ensureBootCompleted();