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

Commit fedc8278 authored by Madiyar Aitbayev's avatar Madiyar Aitbayev Committed by Gerrit Code Review
Browse files

Merge "Close file descriptors of ProfilerInfo"

parents 448003fc b436ce9c

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

+7 −1
Original line number Diff line number Diff line
@@ -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");