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

Commit 06f3cd8e authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by Android (Google) Code Review
Browse files

Merge "Make apk entry separator compliant with jar url format" into mnc-dev

parents 99fc7e95 519919b0

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) {