summaryrefslogtreecommitdiff
path: root/services/java/com
diff options
context:
space:
mode:
authorHans Boehm <hboehm@google.com>2021-07-09 21:48:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-09 21:48:57 +0000
commitab030aab1046b29d4e9660959a3fbd64f02a1972 (patch)
treec9804d4c26eb4beaad99d58e85c395765cb255d8 /services/java/com
parent3df3b73fa39e22940bd7dd1e99785520b28159c3 (diff)
parent57fa4cc3668fc008ddc4a8b9f9f1605c1308258b (diff)
Merge "Add System.runFinalization() call" am: 8df5d94b98 am: 7358684565 am: 0ad0828a9b am: 57fa4cc366
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1760810 Change-Id: I8c5119f0353447471ef43fc3a6dbe1217e0449fe
Diffstat (limited to 'services/java/com')
-rw-r--r--services/java/com/android/server/SystemServer.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 50c1c56c038f..a6ea585d921f 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -551,6 +551,7 @@ public final class SystemServer implements Dumpable {
if (maxFd > enableThreshold) {
// Do a manual GC to clean up fds that are hanging around as garbage.
System.gc();
+ System.runFinalization();
maxFd = getMaxFd();
}