Merge "Fix WebView loading logic to allow changing provider if current disabled" (1075d812) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebViewFactory.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -131,6 +131,8 @@ public final class WebViewFactory {
		private static String TAG_WEBVIEW_PROVIDER = "webviewprovider";
		private static String TAG_PACKAGE_NAME = "packageName";
		private static String TAG_DESCRIPTION = "description";
		// Whether or not the provider must be explicitly chosen by the user to be used.
		private static String TAG_AVAILABILITY = "availableByDefault";
		private static String TAG_SIGNATURE = "signature";

		/**
		@@ -180,8 +182,12 @@ public final class WebViewFactory {
		throw new MissingWebViewPackageException(
		"WebView provider in framework resources missing description");
		}
		String availableByDefault = parser.getAttributeValue(null, TAG_AVAILABILITY);
		if (availableByDefault == null) {
		availableByDefault = "false";
		}
		webViewProviders.add(
		new WebViewProviderInfo(packageName, description,
		new WebViewProviderInfo(packageName, description, availableByDefault,
		readSignatures(parser)));
		}
		else {

core/java/android/webkit/WebViewProviderInfo.java

+37 −1

Original line number	Diff line number	Diff line
		@@ -40,9 +40,11 @@ public class WebViewProviderInfo implements Parcelable {
		public WebViewPackageNotFoundException(Exception e) { super(e); }
		}

		public WebViewProviderInfo(String packageName, String description, String[] signatures) {
		public WebViewProviderInfo(String packageName, String description, String availableByDefault,
		String[] signatures) {
		this.packageName = packageName;
		this.description = description;
		this.availableByDefault = availableByDefault.equals("true");
		this.signatures = signatures;
		}

		@@ -89,6 +91,39 @@ public class WebViewProviderInfo implements Parcelable {
		return false;
		}

		/**
		* Returns whether this package is enabled.
		* This state can be changed by the user from Settings->Apps
		*/
		public boolean isEnabled() {
		try {
		PackageManager pm = AppGlobals.getInitialApplication().getPackageManager();
		int enabled_state = pm.getApplicationEnabledSetting(packageName);
		switch (enabled_state) {
		case PackageManager.COMPONENT_ENABLED_STATE_ENABLED:
		return true;
		case PackageManager.COMPONENT_ENABLED_STATE_DEFAULT:
		ApplicationInfo applicationInfo = getPackageInfo().applicationInfo;
		return applicationInfo.enabled;
		default:
		return false;
		}
		} catch (WebViewPackageNotFoundException e) {
		return false;
		} catch (IllegalArgumentException e) {
		// Thrown by PackageManager.getApplicationEnabledSetting if the package does not exist
		return false;
		}
		}

		/**
		* Returns whether the provider is always available as long as it is valid.
		* If this returns false, the provider will only be used if the user chose this provider.
		*/
		public boolean isAvailableByDefault() {
		return availableByDefault;
		}

		public PackageInfo getPackageInfo() {
		if (packageInfo == null) {
		try {
		@@ -135,6 +170,7 @@ public class WebViewProviderInfo implements Parcelable {
		// fields read from framework resource
		public String packageName;
		public String description;
		private boolean availableByDefault;

		private String[] signatures;

core/res/res/xml/config_webview_packages.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,6 @@

		<webviewproviders>
		<!-- The default WebView implementation -->
		<webviewprovider description="Android WebView" packageName="com.android.webview">
		<webviewprovider description="Android WebView" packageName="com.android.webview" availableByDefault="true">
		</webviewprovider>
		</webviewproviders>

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -291,15 +291,24 @@ public class WebViewUpdateService extends SystemService {

		// If the user has chosen provider, use that
		for (WebViewProviderInfo provider : providers) {
		if (provider.packageName.equals(userChosenProvider)) {
		if (provider.packageName.equals(userChosenProvider) && provider.isEnabled()) {
		return provider.getPackageInfo();
		}
		}

		// User did not choose, or the choice failed, use the most stable provider available
		// User did not choose, or the choice failed; use the most stable provider that is
		// enabled and available by default (not through user choice).
		for (WebViewProviderInfo provider : providers) {
		if (provider.isAvailableByDefault() && provider.isEnabled()) {
		return provider.getPackageInfo();
		}
		}

		// Could not find any enabled package either, use the most stable provider.
		for (WebViewProviderInfo provider : providers) {
		return provider.getPackageInfo();
		}

		mAnyWebViewInstalled = false;
		throw new WebViewFactory.MissingWebViewPackageException(
		"Could not find a loadable WebView package");