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

am: 9274d87a0e Change-Id: I559890874c83627283a891f7eb6c4fd46430f618
2017-06-13 23:30:22 +00:00
parent 3609f00c42 9274d87a0e
commit 26cafd3e42
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -1808,7 +1808,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;