Merge "Close file descriptors of ProfilerInfo" into pi-dev (de91eef7) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -7575,6 +7575,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
		@@ -7659,7 +7662,10 @@ public class ActivityManagerService extends IActivityManager.Stub
		mCoreSettingsObserver.getCoreSettingsLocked(),
		buildSerial, isAutofillCompatEnabled);
		}

		if (profilerInfo != null) {
		profilerInfo.closeFd();
		profilerInfo = null;
		}
		checkTime(startTime, "attachApplicationLocked: immediately after bindApplication");
		updateLruProcessLocked(app, false, null);
		checkTime(startTime, "attachApplicationLocked: after updateLruProcessLocked");