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 
am: 2437f9f10c

Change-Id: I69474f8e14d6abd2657b1fe9c587fef117df38ec
This commit is contained in:
Andreas Gampe
2017-09-15 02:34:44 +00:00
committed by android-build-merger
parent 2d7ef64f47 2437f9f10c
commit 87fcf18ac7
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; mProfileProc = app;
profilerInfo = (mProfilerInfo != null && mProfilerInfo.profileFile != null) ? profilerInfo = (mProfilerInfo != null && mProfilerInfo.profileFile != null) ?
new ProfilerInfo(mProfilerInfo) : null; new ProfilerInfo(mProfilerInfo) : null;
agent = profilerInfo.agent; agent = mProfilerInfo != null ? mProfilerInfo.agent : null;
} else if (app.instr != null && app.instr.mProfileFile != null) { } else if (app.instr != null && app.instr.mProfileFile != null) {
profilerInfo = new ProfilerInfo(app.instr.mProfileFile, null, 0, false, false, profilerInfo = new ProfilerInfo(app.instr.mProfileFile, null, 0, false, false,
null); null);