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

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

Browse Source 
* commit '06f3cd8e8b03786851cc6c9b79487c9c8516e883':
  Make apk entry separator compliant with jar url format
This commit is contained in:
Dimitry Ivanov
2015-06-11 22:05:06 +00:00
committed by Android Git Automerger
parent ff004b9f2f 06f3cd8e8b
commit b900e2c76d
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());
continue;
}
if (path.contains("!")) {
String[] split = TextUtils.split(path, "!");
if (path.contains("!/")) {
String[] split = TextUtils.split(path, "!/");
if (split.length == 2) {
try {
ZipFile z = new ZipFile(split[0]);
@@ -384,7 +384,7 @@ public final class WebViewFactory {
ZipEntry e = z.getEntry(entry);
if (e != null && e.getMethod() == ZipEntry.STORED) {
// Return a path formatted for dlopen() load from APK.
return apkPath + "!" + entry;
return apkPath + "!/" + entry;
}
}
} catch (IOException e) {