commit | 139124cd779e4e9eef305a40cb3135620fec791e | [log] [tgz] |
---|---|---|
author | Chuanghua Zhao <chuanghua.zhao@mediatek.com> | Wed Oct 24 14:33:56 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 24 14:33:56 2018 -0700 |
tree | c179ce237de3fbd22d72d998153ba98f874c2b4a | |
parent | b7ce376383cfeb3fb00ed77d5a1928a2019edc10 [diff] | |
parent | 9882ad7a2781f304e4520f5a17cd9c496ae53585 [diff] |
Merge "Fix FD leak during ADB shell install." am: c558f4cedf am: 9882ad7a27 Change-Id: I6a8053db6ff17f64fddf6149424b21f30dc49b09
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); } }