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

am 1b48a643: Merge "Revert "Load WebView from one out of a list of packages."" into mnc-dev

Browse Source 
* commit '1b48a6430ae503ff2826657ef0d1d4a090f7aa37':
  Revert "Load WebView from one out of a list of packages."
This commit is contained in:
Gustav Sennton
2015-06-19 13:35:08 +00:00
committed by Android Git Automerger
parent b91c7a76d5 1b48a6430a
commit 05996c10cc
4 changed files with 22 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
core/java/android/webkit/WebViewFactory.java
View File

@@ -96,49 +96,27 @@ 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;
}
} catch (PackageManager.NameNotFoundException e) {
}
try {
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) {
@@ -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 + ")");
@@ -241,8 +219,8 @@ public final class WebViewFactory {
try {
// Construct a package context to load the Java code into the current app.
Context webViewContext = initialApplication.createPackageContext(
sPackageInfo.packageName,
Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY);
sPackageInfo.packageName,
Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY);
initialApplication.getAssets().addAssetPath(
webViewContext.getApplicationInfo().sourceDir);
ClassLoader clazzLoader = webViewContext.getClassLoader();

6
core/res/res/values/config.xml
View File

@@ -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

2
core/res/res/values/symbols.xml
View File

@@ -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" />

21
services/core/java/com/android/server/webkit/WebViewUpdateService.java
View File

@@ -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;
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;
}
String webviewPackage = "package:" + WebViewFactory.getWebViewPackageName();
if (webviewPackage.equals(intent.getDataString())) {
onWebViewUpdateInstalled();
}
}
};