diff options
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 13 | ||||
| -rw-r--r-- | core/java/android/webkit/JniUtil.java | 2 | ||||
| -rw-r--r-- | core/java/android/webkit/MimeTypeMap.java | 1 | ||||
| -rw-r--r-- | core/java/android/webkit/URLUtil.java | 3 |
4 files changed, 6 insertions, 13 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index 72af251fe05a..7b6b54cce0cf 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -692,13 +692,10 @@ class BrowserFrame extends Handler { * @return An InputStream to the android resource */ private InputStream inputStreamForAndroidResource(String url) { - // This list needs to be kept in sync with the list in - // external/webkit/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp - final String ANDROID_ASSET = "file:///android_asset/"; - final String ANDROID_RESOURCE = "file:///android_res/"; - final String ANDROID_CONTENT = "content:"; + final String ANDROID_ASSET = URLUtil.ASSET_BASE; + final String ANDROID_RESOURCE = URLUtil.RESOURCE_BASE; + final String ANDROID_CONTENT = URLUtil.CONTENT_BASE; - // file:///android_res if (url.startsWith(ANDROID_RESOURCE)) { url = url.replaceFirst(ANDROID_RESOURCE, ""); if (url == null || url.length() == 0) { @@ -736,8 +733,6 @@ class BrowserFrame extends Handler { Log.e(LOGTAG, "Exception: " + url); return null; } - - // file:///android_asset } else if (url.startsWith(ANDROID_ASSET)) { url = url.replaceFirst(ANDROID_ASSET, ""); try { @@ -747,8 +742,6 @@ class BrowserFrame extends Handler { } catch (IOException e) { return null; } - - // content:// } else if (mSettings.getAllowContentAccess() && url.startsWith(ANDROID_CONTENT)) { try { diff --git a/core/java/android/webkit/JniUtil.java b/core/java/android/webkit/JniUtil.java index 343d34a56643..e3e6092e85a5 100644 --- a/core/java/android/webkit/JniUtil.java +++ b/core/java/android/webkit/JniUtil.java @@ -100,7 +100,7 @@ class JniUtil { return sContext.getPackageName(); } - private static final String ANDROID_CONTENT = "content:"; + private static final String ANDROID_CONTENT = URLUtil.CONTENT_BASE; /** * Called by JNI. Calculates the size of an input stream by reading it. diff --git a/core/java/android/webkit/MimeTypeMap.java b/core/java/android/webkit/MimeTypeMap.java index 35483c988ea9..da8901a0e633 100644 --- a/core/java/android/webkit/MimeTypeMap.java +++ b/core/java/android/webkit/MimeTypeMap.java @@ -17,7 +17,6 @@ package android.webkit; import android.text.TextUtils; -import java.util.HashMap; import java.util.regex.Pattern; import libcore.net.MimeUtils; diff --git a/core/java/android/webkit/URLUtil.java b/core/java/android/webkit/URLUtil.java index 9970c933b731..b47f04f3211a 100644 --- a/core/java/android/webkit/URLUtil.java +++ b/core/java/android/webkit/URLUtil.java @@ -38,6 +38,7 @@ public final class URLUtil { static final String RESOURCE_BASE = "file:///android_res/"; static final String FILE_BASE = "file://"; static final String PROXY_BASE = "file:///cookieless_proxy/"; + static final String CONTENT_BASE = "content:"; /** * Cleans up (if possible) user-entered web addresses @@ -253,7 +254,7 @@ public final class URLUtil { * @return True iff the url is a content: url. */ public static boolean isContentUrl(String url) { - return (null != url) && url.startsWith("content:"); + return (null != url) && url.startsWith(CONTENT_BASE); } /** |