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

This commit is contained in:
TreeHugger Robot
2017-06-13 23:16:58 +00:00
committed by Android (Google) Code Review

View File

@@ -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;