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

Commit 0b0c8c0a authored by Marcin Kosiba's avatar Marcin Kosiba Committed by Android Git Automerger
Browse files

am 5ddbe722: Merge "Load the WebView Java code via createPackageContext." 

* commit '5ddbe722':
  Load the WebView Java code via createPackageContext.
parents f5249619 5ddbe722

core/java/android/webkit/WebViewFactory.java

+14 −1
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package android.webkit;



import android.app.AppGlobals;

import android.content.Context;

import android.content.pm.PackageManager;

import android.os.Build;

import android.os.StrictMode;

import android.os.SystemProperties;
@@ -92,6 +95,16 @@ public final class WebViewFactory { 
    }



    private static Class<WebViewFactoryProvider> getFactoryClass() throws ClassNotFoundException {

        return (Class<WebViewFactoryProvider>) Class.forName(CHROMIUM_WEBVIEW_FACTORY);

        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(NULL_WEBVIEW_FACTORY);

        }

    }

}