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

Commit 57d201ba authored by Madiyar Aitbayev's avatar Madiyar Aitbayev Committed by android-build-merger
Browse files

Merge "Close file descriptors of ProfilerInfo" into pi-dev 

am: de91eef7

Change-Id: I3d7cbb7423cae868a52fc88e2055eea32831a390
parents 661a9db9 de91eef7

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");