Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-13 23:16:58 +00:00
committed by Android (Google) Code Review
parent 167f0001b8 e3d4eb6b35
commit 9274d87a0e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityManagerService.java
View File

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