Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure at least one default-available webview package is a non-fallback" into nyc-dev

Browse Source
This commit is contained in:
Gustav Sennton
2016-04-14 10:25:13 +00:00
committed by Android (Google) Code Review
parent 0628d324d0 c0bc993801
commit f014c74ec4
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/webkit/SystemImpl.java
View File

@@ -68,6 +68,7 @@ public class SystemImpl implements SystemInterface {
public WebViewProviderInfo[] getWebViewPackages() { public WebViewProviderInfo[] getWebViewPackages() {
int numFallbackPackages = 0; int numFallbackPackages = 0;
int numAvailableByDefaultPackages = 0; int numAvailableByDefaultPackages = 0;
int numAvByDefaultAndNotFallback = 0;
XmlResourceParser parser = null; XmlResourceParser parser = null;
List<WebViewProviderInfo> webViewProviders = new ArrayList<WebViewProviderInfo>(); List<WebViewProviderInfo> webViewProviders = new ArrayList<WebViewProviderInfo>();
try { try {
@@ -111,6 +112,9 @@ public class SystemImpl implements SystemInterface {
} }
if (currentProvider.availableByDefault) { if (currentProvider.availableByDefault) {
numAvailableByDefaultPackages++; numAvailableByDefaultPackages++;
if (!currentProvider.isFallback) {
numAvByDefaultAndNotFallback++;
}
} }
webViewProviders.add(currentProvider); webViewProviders.add(currentProvider);
} }
@@ -127,6 +131,10 @@ public class SystemImpl implements SystemInterface {
throw new AndroidRuntimeException("There must be at least one WebView package " throw new AndroidRuntimeException("There must be at least one WebView package "
+ "that is available by default"); + "that is available by default");
} }
if (numAvByDefaultAndNotFallback == 0) {
throw new AndroidRuntimeException("There must be at least one WebView package "
+ "that is available by default and not a fallback");
}
return webViewProviders.toArray(new WebViewProviderInfo[webViewProviders.size()]); return webViewProviders.toArray(new WebViewProviderInfo[webViewProviders.size()]);
} }