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

Commit 9274d87a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use UiContext with StrictMode Dialog" into oc-dev

parents 167f0001 e3d4eb6b

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1808,7 +1808,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    }

                    }

                    AppErrorResult res = (AppErrorResult) data.get("result");

                    AppErrorResult res = (AppErrorResult) data.get("result");

                    if (mShowDialogs && !mSleeping && !mShuttingDown) {

                    if (mShowDialogs && !mSleeping && !mShuttingDown) {

                        Dialog d = new StrictModeViolationDialog(mContext,

                        Dialog d = new StrictModeViolationDialog(mUiContext,

                                ActivityManagerService.this, res, proc);

                                ActivityManagerService.this, res, proc);

                        d.show();

                        d.show();

                        proc.crashDialog = d;

                        proc.crashDialog = d;