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

Commit 5c013d49 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 

am: 87fcf18a

Change-Id: I59e26973945ca6dfa69743e70a141fd93c4465ed
parents c547bd8a 87fcf18a

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

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