From 519919b0d4b9ebeb685ce9f3632078545792e408 Mon Sep 17 00:00:00 2001
From: Simon Baldwin <simonb@google.com>
Date: Thu, 11 Jun 2015 17:09:49 +0100
Subject: [PATCH] Make apk entry separator compliant with jar url format

Bug: http://b/21726698
Bug: http://b/8076853
Change-Id: I4106dd82aeb5d7d66c9988be6e8c8726c78ae08c
---
 core/java/android/webkit/WebViewFactory.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java
index b7d529e0c8847..b4ef58afb94d5 100644
--- a/core/java/android/webkit/WebViewFactory.java
+++ b/core/java/android/webkit/WebViewFactory.java
@@ -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) {