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

Commit 50eb1bce authored by Madiyar Aitbayev's avatar Madiyar Aitbayev Committed by android-build-merger
Browse files

Merge "Close file descriptors of ProfilerInfo" 

am: fedc8278

Change-Id: I14cb671fad07b3115c2d5237fc9aff0e3c94a349
parents fae13b29 fedc8278

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

+7 −1
Original line number Diff line number Diff line
@@ -7160,6 +7160,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










@@ -7226,7 +7229,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");