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

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

Merge "Frameworks: Fix system server profiling" 

am: eed99d86

Change-Id: Ia07782e694d066f827e99fffa49c93321444b851
parents 5c97779e eed99d86

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ public final class ActivityThread { 
                        streamingOutput);

                profiling = true;

            } catch (RuntimeException e) {

                Slog.w(TAG, "Profiling failed on path " + profileFile);

                Slog.w(TAG, "Profiling failed on path " + profileFile, e);

                try {

                    profileFd.close();

                    profileFd = null;

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

+8 −0
Original line number Diff line number Diff line
@@ -23615,6 +23615,14 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    } catch (IOException e) {

                    }

                    mProfilerInfo.profileFd = null;













                    if (proc.pid == MY_PID) {













                        // When profiling the system server itself, avoid closing the file













                        // descriptor, as profilerControl will not create a copy.













                        // Note: it is also not correct to just set profileFd to null, as the













                        //       whole ProfilerInfo instance is passed down!













                        profilerInfo = null;













                    }















                } else {















                    stopProfilerLocked(proc, profileType);















                    if (profilerInfo != null && profilerInfo.profileFd != null) {