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

Commit d9730182 authored by Gustav Sennton's avatar Gustav Sennton
Browse files

Revert "Load WebView from one out of a list of packages." 

This was not a clean revert!

This reverts commit 2ed6fee1.
We essentially only revert the functionality for going through a list of
WebView package names and picking the first compatible one.
Except for that functionality we also fetched the name of the shared
library from a flag in WebView and made some minor refactoring in the
initial commit, these changes have been left alone in this revert.

Bug: 21893371
Change-Id: Idb2539dc33cc5f9e2894ecd665c23573c6cba9f3
parent 9a08fe2a

core/java/android/webkit/WebViewFactory.java

+16 −38
Original line number Diff line number Diff line
@@ -96,50 +96,28 @@ public final class WebViewFactory { 
        public MissingWebViewPackageException(Exception e) { super(e); }

    }



    /** @hide */

    public static String[] getWebViewPackageNames() {

        return AppGlobals.getInitialApplication().getResources().getStringArray(

                com.android.internal.R.array.config_webViewPackageNames);

    }



    // TODO (gsennton) remove when committing webview xts test change

    public static String getWebViewPackageName() {

        String[] webViewPackageNames = getWebViewPackageNames();

        return webViewPackageNames[webViewPackageNames.length-1];

        return AppGlobals.getInitialApplication().getString(

                com.android.internal.R.string.config_webViewPackageName);

    }



    /**

     * Return the package info of the first package in the webview priority list that contains

     * webview.

     *

     * @hide

     */

    public static PackageInfo findPreferredWebViewPackage() {

    private static PackageInfo fetchPackageInfo() {

        PackageManager pm = AppGlobals.getInitialApplication().getPackageManager();



        for (String packageName : getWebViewPackageNames()) {

        try {

                PackageInfo packageInfo = pm.getPackageInfo(packageName,

                    PackageManager.GET_META_DATA);

                ApplicationInfo applicationInfo = packageInfo.applicationInfo;



                // If the correct flag is set the package contains webview.

                if (getWebViewLibrary(applicationInfo) != null) {

                    return packageInfo;

                }

            return pm.getPackageInfo(getWebViewPackageName(), PackageManager.GET_META_DATA);

        } catch (PackageManager.NameNotFoundException e) {

            throw new MissingWebViewPackageException(e);

        }

    }

        throw new MissingWebViewPackageException("Could not find a loadable WebView package");

    }



    // throws MissingWebViewPackageException

    private static ApplicationInfo getWebViewApplicationInfo() {

        if (sPackageInfo == null)

            return findPreferredWebViewPackage().applicationInfo;

        else

        if (sPackageInfo == null) {

            return fetchPackageInfo().applicationInfo;

        } else {

            return sPackageInfo.applicationInfo;

        }

    }



    private static String getWebViewLibrary(ApplicationInfo ai) {

        if (ai.metaData != null)
@@ -153,10 +131,10 @@ public final class WebViewFactory { 


    /**

     * Load the native library for the given package name iff that package

     * name is the same as the one providing the current webview.

     * name is the same as the one providing the webview.

     */

    public static int loadWebViewNativeLibraryFromPackage(String packageName) {

        sPackageInfo = findPreferredWebViewPackage();

        sPackageInfo = fetchPackageInfo();

        if (packageName != null && packageName.equals(sPackageInfo.packageName)) {

            return loadNativeLibrary();

        }
@@ -202,7 +180,7 @@ public final class WebViewFactory { 
    private static Class<WebViewFactoryProvider> getProviderClass() {

        try {

            // First fetch the package info so we can log the webview package version.

            sPackageInfo = findPreferredWebViewPackage();

            sPackageInfo = fetchPackageInfo();

            Log.i(LOGTAG, "Loading " + sPackageInfo.packageName + " version " +

                sPackageInfo.versionName + " (code " + sPackageInfo.versionCode + ")");

core/res/res/values/config.xml

+2 −4
Original line number Diff line number Diff line
@@ -2031,10 +2031,8 @@ 
        string that's stored in 8-bit unpacked format) characters.-->

    <bool translatable="false" name="config_sms_decode_gsm_8bit_data">false</bool>



    <!-- List of package names (ordered by preference) providing WebView implementations. -->

    <string-array name="config_webViewPackageNames" translatable="false">

      <item>com.android.webview</item>

    </string-array>

    <!-- Package name providing WebView implementation. -->

    <string name="config_webViewPackageName" translatable="false">com.android.webview</string>



    <!-- If EMS is not supported, framework breaks down EMS into single segment SMS

         and adds page info " x/y". This config is used to set which carrier doesn't

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -2018,7 +2018,7 @@ 
  <java-symbol type="attr" name="actionModeWebSearchDrawable" />

  <java-symbol type="string" name="websearch" />

  <java-symbol type="drawable" name="ic_media_video_poster" />

  <java-symbol type="array" name="config_webViewPackageNames" />

  <java-symbol type="string" name="config_webViewPackageName" />



  <!-- From SubtitleView -->

  <java-symbol type="dimen" name="subtitle_corner_radius" />

services/core/java/com/android/server/webkit/WebViewUpdateService.java

+3 −18
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ public class WebViewUpdateService extends SystemService { 
    private boolean mRelroReady32Bit = false;

    private boolean mRelroReady64Bit = false;



    private String oldWebViewPackageName = null;



    private BroadcastReceiver mWebViewUpdatedReceiver;



    public WebViewUpdateService(Context context) {
@@ -53,22 +51,9 @@ public class WebViewUpdateService extends SystemService { 
        mWebViewUpdatedReceiver = new BroadcastReceiver() {

                @Override

                public void onReceive(Context context, Intent intent) {



                    for (String packageName : WebViewFactory.getWebViewPackageNames()) {

                        String webviewPackage = "package:" + packageName;



                    String webviewPackage = "package:" + WebViewFactory.getWebViewPackageName();

                    if (webviewPackage.equals(intent.getDataString())) {

                            String usedPackageName =

                                WebViewFactory.findPreferredWebViewPackage().packageName;

                            // Only trigger update actions if the updated package is the one that

                            // will be used, or the one that was in use before the update.

                            if (packageName.equals(usedPackageName) ||

                                    packageName.equals(oldWebViewPackageName)) {

                        onWebViewUpdateInstalled();

                                oldWebViewPackageName = usedPackageName;

                            }

                            return;

                        }

                    }

                }

        };