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

Commit 69ccdbd7 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Merge commit 'bc52ca28' 

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

Change-Id: I6da33a191a4ac13d08d8350a432b205e3dff85da
parents 3e29718d bc52ca28

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

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