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

Merge "Make getMinimumVersionCode thread safe."

Browse Source
This commit is contained in:
Hui Shu
2016-05-24 16:05:05 +00:00
committed by Android (Google) Code Review
parent ab9c317dfb 9ee6bdfe61
commit 99a0089fc9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java
View File

@@ -595,13 +595,14 @@ public class WebViewUpdateServiceImpl {
return mMinimumVersionCode;
}
int minimumVersionCode = -1;
for (WebViewProviderInfo provider : mSystemInterface.getWebViewPackages()) {
if (provider.availableByDefault && !provider.isFallback) {
try {
int versionCode =
mSystemInterface.getFactoryPackageVersion(provider.packageName);
if (mMinimumVersionCode < 0 || versionCode < mMinimumVersionCode) {
mMinimumVersionCode = versionCode;
if (minimumVersionCode < 0 || versionCode < minimumVersionCode) {
minimumVersionCode = versionCode;
}
} catch (NameNotFoundException e) {
// Safe to ignore.
@@ -609,6 +610,7 @@ public class WebViewUpdateServiceImpl {
}
}
mMinimumVersionCode = minimumVersionCode;
return mMinimumVersionCode;
}
}