Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Close file descriptors of ProfilerInfo"

Browse Source
This commit is contained in:
Madiyar Aitbayev
2018-03-20 18:14:42 +00:00
committed by Gerrit Code Review
parent 448003fc49 b436ce9cea
commit fedc8278ea
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -7145,6 +7145,9 @@ public class ActivityManagerService extends IActivityManager.Stub
if (profilerInfo != null && profilerInfo.profileFd != null) {
profilerInfo.profileFd = profilerInfo.profileFd.dup();
if (TextUtils.equals(mProfileApp, processName) && mProfilerInfo != null) {
clearProfilerLocked();
}
}
// We deprecated Build.SERIAL and it is not accessible to
@@ -7211,7 +7214,10 @@ public class ActivityManagerService extends IActivityManager.Stub
mCoreSettingsObserver.getCoreSettingsLocked(),
buildSerial);
}
if (profilerInfo != null) {
profilerInfo.closeFd();
profilerInfo = null;
}
checkTime(startTime, "attachApplicationLocked: immediately after bindApplication");
updateLruProcessLocked(app, false, null);
checkTime(startTime, "attachApplicationLocked: after updateLruProcessLocked");