Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 519919b0 authored by Simon Baldwin's avatar Simon Baldwin
Browse files

Make apk entry separator compliant with jar url format 

Bug: http://b/21726698
Bug: http://b/8076853
Change-Id: I4106dd82aeb5d7d66c9988be6e8c8726c78ae08c
parent b2af4220

core/java/android/webkit/WebViewFactory.java

+3 −3
Original line number Diff line number Diff line
@@ -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) {