Check for null data after decoding a data: url.

Refactor StreamLoader and friends since they all use a Context.  Change the
successful status to 200 instead of 0. Not sure why it was ever 0.

Bug: 2364322

1 files changed, 7 insertions, 8 deletions

diff --git a/core/java/android/webkit/FrameLoader.java b/core/java/android/webkit/FrameLoader.java
index 51f60c39a9b5..58eca38edae2 100644
--- a/core/java/android/webkit/FrameLoader.java
+++ b/core/java/android/webkit/FrameLoader.java
@@ -141,22 +141,21 @@ class FrameLoader {
             return true;
         }
         if (URLUtil.isAssetUrl(url)) {
-            FileLoader.requestUrl(url, loadListener, loadListener.getContext(),
-                    FileLoader.TYPE_ASSET, true);
+            FileLoader.requestUrl(url, loadListener, FileLoader.TYPE_ASSET,
+                    true);
             return true;
         } else if (URLUtil.isResourceUrl(url)) {
-            FileLoader.requestUrl(url, loadListener, loadListener.getContext(),
-                    FileLoader.TYPE_RES, true);
+            FileLoader.requestUrl(url, loadListener, FileLoader.TYPE_RES,
+                    true);
             return true;
         } else if (URLUtil.isFileUrl(url)) {
-            FileLoader.requestUrl(url, loadListener, loadListener.getContext(),
-                    FileLoader.TYPE_FILE, settings.getAllowFileAccess());
+            FileLoader.requestUrl(url, loadListener, FileLoader.TYPE_FILE,
+                    settings.getAllowFileAccess());
             return true;
         } else if (URLUtil.isContentUrl(url)) {
             // Send the raw url to the ContentLoader because it will do a
             // permission check and the url has to match..
-            ContentLoader.requestUrl(loadListener.url(), loadListener,
-                                     loadListener.getContext());
+            ContentLoader.requestUrl(loadListener.url(), loadListener);
             return true;
         } else if (URLUtil.isDataUrl(url)) {
             DataLoader.requestUrl(url, loadListener);