Merge "Fix FD leak during ADB shell install."

am: c558f4cedf Change-Id: I55a6e43fca47d55061b173f824bfa8b202076d17
2018-10-20 01:20:28 -07:00
parent fb5b05d2ff c558f4cedf
commit 9882ad7a27
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);
                        }
                    }