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

am: 9882ad7a27 Change-Id: I6a8053db6ff17f64fddf6149424b21f30dc49b09
2018-10-24 14:33:56 -07:00
parent b7ce376383 9882ad7a27
commit 139124cd77
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -702,6 +702,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
                        if (PackageInstaller.ENABLE_REVOCABLE_FD) {
                            mFds.remove(fd);
                        } else {
+                            bridge.forceClose();
                            mBridges.remove(bridge);
                        }
                    }