Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87fcf18a authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

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

am: 2437f9f1

Change-Id: I69474f8e14d6abd2657b1fe9c587fef117df38ec
parents 2d7ef64f 2437f9f1

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);