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

2018-10-25 23:39:40 +00:00
parent 12edaafefc 3a9756c205
commit 33dd7512ca
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
@@ -682,6 +682,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
                        if (PackageInstaller.ENABLE_REVOCABLE_FD) {
                            mFds.remove(fd);
                        } else {
+                            bridge.forceClose();
                            mBridges.remove(bridge);
                        }
                    }