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

Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-15 02:11:12 +00:00
committed by Android (Google) Code Review
parent 982ee8e6c3 55351365a9
commit 2437f9f10c
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

@@ -7005,7 +7005,7 @@ public class ActivityManagerService extends IActivityManager.Stub
mProfileProc = app;
profilerInfo = (mProfilerInfo != null && mProfilerInfo.profileFile != null) ?
new ProfilerInfo(mProfilerInfo) : null;
agent = profilerInfo.agent;
agent = mProfilerInfo != null ? mProfilerInfo.agent : null;
} else if (app.instr != null && app.instr.mProfileFile != null) {
profilerInfo = new ProfilerInfo(app.instr.mProfileFile, null, 0, false, false,
null);