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

Commit 6e54251a authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "Use UiContext with StrictMode Dialog" into oc-dev am: 9274d87a 

am: 26cafd3e

Change-Id: I59bdeb970bd305f7c01a3f2cf405102ae95756ed
parents 2e214c44 26cafd3e

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

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

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

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

                        Dialog d = new StrictModeViolationDialog(mContext,

                        Dialog d = new StrictModeViolationDialog(mUiContext,

                                ActivityManagerService.this, res, proc);

                        d.show();

                        proc.crashDialog = d;