commit 33dd7512caae782a4191de0fd9160df5f66f3d94
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Oct 25 23:39:40 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 25 23:39:40 2018 +0000
tree 16e2fa73ca1a18536d0cac082176b7284d793cda
parent 12edaafefc5aee1f87fc5aba4168d87cb64458e5
parent 3a9756c205efda8c70d788cdefe2926ebf8f7f99

Merge "Merge "Fix FD leak during ADB shell install." am: c558f4cedf am: 9882ad7a27 am: 139124cd77"

services/core/java/com/android/server/pm/PackageInstallerSession.java

diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index 006ea75..51225a7 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -682,6 +682,7 @@
                         if (PackageInstaller.ENABLE_REVOCABLE_FD) {
                             mFds.remove(fd);
                         } else {
+                            bridge.forceClose();
                             mBridges.remove(bridge);
                         }
                     }