commit 08424b125b1ac28206341f2224d128bbe40d8701
author Ben Murdoch <benm@google.com> Mon Jul 28 21:07:24 2014 +0100
committer The Android Automerger <android-build@google.com> Mon Jul 28 14:32:53 2014 -0700
tree 7dc58b7ac3cad715effcc3cb64d5dfbd63f5538a
parent 3218f8c8d178eb57dbe29f0ef87866c5579b5948

Revert "Load the WebView Java code from an APK." DO NOT MERGE

This reverts commit 72618c3363c83f2668dab4495b100a61d6d8700a.

Bug: 16448724

core/java/android/webkit/WebViewFactory.java

diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java
index 0401fb7..2c7b3eb 100644
--- a/core/java/android/webkit/WebViewFactory.java
+++ b/core/java/android/webkit/WebViewFactory.java
@@ -16,9 +16,6 @@
 
 package android.webkit;
 
-import android.app.AppGlobals;
-import android.content.Context;
-import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Process;
 import android.os.RemoteException;
@@ -103,14 +100,9 @@
 
     private static Class<WebViewFactoryProvider> getFactoryClass() throws ClassNotFoundException {
         try {
-            Context webViewContext = AppGlobals.getInitialApplication().createPackageContext(
-                    getWebViewPackageName(),
-                    Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY);
-            ClassLoader clazzLoader = webViewContext.getClassLoader();
-            return (Class<WebViewFactoryProvider>) Class.forName(CHROMIUM_WEBVIEW_FACTORY, true,
-                                                                 clazzLoader);
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.e(LOGTAG, "Chromium WebView package does not exist");
+            return (Class<WebViewFactoryProvider>) Class.forName(CHROMIUM_WEBVIEW_FACTORY);
+        } catch (ClassNotFoundException e) {
+            Log.e(LOGTAG, "Chromium WebView does not exist");
             return (Class<WebViewFactoryProvider>) Class.forName(NULL_WEBVIEW_FACTORY);
         }
     }