commit 2b073a0e897a7f48be6fc4e915e4171b7bdfb2b9
author Andreas Gampe <agampe@google.com> Thu Jun 22 17:28:57 2017 -0700
committer Andreas Gampe <agampe@google.com> Thu Jun 29 20:42:25 2017 -0700
tree 12022c539cd2e581be4051be377a1c267103328b
parent 2fa4a346ecea162d3e694c2c53582f3cc31bcc68

Frameworks: Clean up ProfilerInfo

Use a ProfilerInfo object in ActivityManagerService to reduce the
number of exposed fields. In preparation for adding an agent during
startup.

Bug: 62445317
Test: m
Test: Device boots
Test: Manual test for profiling
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAmProfileTests
Change-Id: I5fa347ded760c263a8ce3754bb2631205ea7b4b8

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

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index fa279c2..90d9149 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1442,26 +1442,17 @@
                 if (mService.mProfileApp != null && mService.mProfileApp.equals(app.processName)) {
                     if (mService.mProfileProc == null || mService.mProfileProc == app) {
                         mService.mProfileProc = app;
-                        final String profileFile = mService.mProfileFile;
-                        if (profileFile != null) {
-                            ParcelFileDescriptor profileFd = mService.mProfileFd;
-                            if (profileFd != null) {
+                        ProfilerInfo profilerInfoSvc = mService.mProfilerInfo;
+                        if (profilerInfoSvc != null && profilerInfoSvc.profileFile != null) {
+                            if (profilerInfoSvc.profileFd != null) {
                                 try {
-                                    profileFd = profileFd.dup();
+                                    profilerInfoSvc.profileFd = profilerInfoSvc.profileFd.dup();
                                 } catch (IOException e) {
-                                    if (profileFd != null) {
-                                        try {
-                                            profileFd.close();
-                                        } catch (IOException o) {
-                                        }
-                                        profileFd = null;
-                                    }
+                                    profilerInfoSvc.closeFd();
                                 }
                             }
 
-                            profilerInfo = new ProfilerInfo(profileFile, profileFd,
-                                    mService.mSamplingInterval, mService.mAutoStopProfiler,
-                                    mService.mStreamingOutput);
+                            profilerInfo = new ProfilerInfo(profilerInfoSvc);
                         }
                     }
                 }