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

am: 139124cd77

Change-Id: I9742eadf7e7de255c73bce7a8246a6e5247526ca

1 files changed, 1 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index 006ea75ea160..51225a77b005 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 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
                         if (PackageInstaller.ENABLE_REVOCABLE_FD) {
                             mFds.remove(fd);
                         } else {
+                            bridge.forceClose();
                             mBridges.remove(bridge);
                         }
                     }