Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c207c943: am c5283927: Close ZipFiles correctly in WebViewFactory.

Browse Source 
* commit 'c207c9437d5e15baaa7add776cff2cfb2e3d22c8':
  Close ZipFiles correctly in WebViewFactory.
This commit is contained in:
Torne (Richard Coles)
2015-08-10 16:08:32 +00:00
committed by Android Git Automerger
parent 8cb92371b8 c207c9437d
commit 20272bec66
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/WebViewFactory.java
View File

@@ -314,8 +314,7 @@ public final class WebViewFactory {
if (path.contains("!/")) { if (path.contains("!/")) {
String[] split = TextUtils.split(path, "!/"); String[] split = TextUtils.split(path, "!/");
if (split.length == 2) { if (split.length == 2) {
try { try (ZipFile z = new ZipFile(split[0])) {
ZipFile z = new ZipFile(split[0]);
ZipEntry e = z.getEntry(split[1]); ZipEntry e = z.getEntry(split[1]);
if (e != null && e.getMethod() == ZipEntry.STORED) { if (e != null && e.getMethod() == ZipEntry.STORED) {
newVmSize = Math.max(newVmSize, e.getSize()); newVmSize = Math.max(newVmSize, e.getSize());
@@ -355,8 +354,7 @@ public final class WebViewFactory {
String[] abiList, String[] abiList,
String nativeLibFileName) { String nativeLibFileName) {
// Search the APK for a native library conforming to a listed ABI. // Search the APK for a native library conforming to a listed ABI.
try { try (ZipFile z = new ZipFile(apkPath)) {
ZipFile z = new ZipFile(apkPath);
for (String abi : abiList) { for (String abi : abiList) {
final String entry = "lib/" + abi + "/" + nativeLibFileName; final String entry = "lib/" + abi + "/" + nativeLibFileName;
ZipEntry e = z.getEntry(entry); ZipEntry e = z.getEntry(entry);