commit c558f4cedfcb8a4f62a63e070b3cccfffdf3b3ca
author Treehugger Robot <treehugger-gerrit@google.com> Sat Oct 20 07:25:24 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 20 07:25:24 2018 +0000
tree 3f60a2ce4f768d82fce4296307cf38dd959462b3
parent 46049f5fece2c40c7c9ba36db9a65b1369782c67
parent b584c6eb8cd43d8fc566626a633e3c0b6e33d7de

Merge "Fix FD leak during ADB shell install."

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 fa934fe..81a8367 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -702,6 +702,7 @@
                         if (PackageInstaller.ENABLE_REVOCABLE_FD) {
                             mFds.remove(fd);
                         } else {
+                            bridge.forceClose();
                             mBridges.remove(bridge);
                         }
                     }