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

am b900e2c7: am 06f3cd8e: Merge "Make apk entry separator compliant with jar url format" into mnc-dev

Browse Source 
* commit 'b900e2c76d2b8b937e5e5b8534a62cbf75b2398f':
  Make apk entry separator compliant with jar url format
This commit is contained in:
Dimitry Ivanov
2015-06-11 22:17:01 +00:00
committed by Android Git Automerger
parent 4aad8a4c0d b900e2c76d
commit d1fff752bf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,8 +333,8 @@ public final class WebViewFactory {
newVmSize = Math.max(newVmSize, f.length()); newVmSize = Math.max(newVmSize, f.length());
continue; continue;
} }
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]);
@@ -384,7 +384,7 @@ public final class WebViewFactory {
ZipEntry e = z.getEntry(entry); ZipEntry e = z.getEntry(entry);
if (e != null && e.getMethod() == ZipEntry.STORED) { if (e != null && e.getMethod() == ZipEntry.STORED) {
// Return a path formatted for dlopen() load from APK. // Return a path formatted for dlopen() load from APK.
return apkPath + "!" + entry; return apkPath + "!/" + entry;
} }
} }
} catch (IOException e) { } catch (IOException e) {