summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/webview/WebViewAppPicker.java
diff options
context:
space:
mode:
authorFan Zhang <zhfan@google.com>2018-03-22 15:28:46 -0700
committerFan Zhang <zhfan@google.com>2018-03-22 15:28:46 -0700
commit5f9a348f7e8a4c3a5f7968e4dfb3ae77cd2b55ce (patch)
treef2a45d5d129c04f83bb7ee75936f22d62c9f7376 /src/com/android/settings/webview/WebViewAppPicker.java
parent6c5af54af9569702cdf3923a6176808412a4aa64 (diff)
downloadpackages_apps_Settings-5f9a348f7e8a4c3a5f7968e4dfb3ae77cd2b55ce.tar.gz
packages_apps_Settings-5f9a348f7e8a4c3a5f7968e4dfb3ae77cd2b55ce.tar.bz2
packages_apps_Settings-5f9a348f7e8a4c3a5f7968e4dfb3ae77cd2b55ce.zip
Get rid of UserPackageWrapper util.
Robolectric can support framework private classes now, so there is no need to use wrappers. Bug: 76167422 Test: robotests Change-Id: I034a9f0a9856348bff491f2e9b2b1f7d682ab942
Diffstat (limited to 'src/com/android/settings/webview/WebViewAppPicker.java')
-rw-r--r--src/com/android/settings/webview/WebViewAppPicker.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/webview/WebViewAppPicker.java b/src/com/android/settings/webview/WebViewAppPicker.java
index a5fef46ee2..f68d27bdc4 100644
--- a/src/com/android/settings/webview/WebViewAppPicker.java
+++ b/src/com/android/settings/webview/WebViewAppPicker.java
@@ -27,11 +27,11 @@ import android.content.pm.PackageItemInfo;
import android.content.pm.PackageManager;
import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
+import android.webkit.UserPackage;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
-import com.android.settings.wrapper.UserPackageWrapper;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -150,9 +150,9 @@ public class WebViewAppPicker extends DefaultAppPickerFragment {
@VisibleForTesting
String getDisabledReason(WebViewUpdateServiceWrapper webviewUpdateServiceWrapper,
Context context, String packageName) {
- List<UserPackageWrapper> userPackages =
+ List<UserPackage> userPackages =
webviewUpdateServiceWrapper.getPackageInfosAllUsers(context, packageName);
- for (UserPackageWrapper userPackage : userPackages) {
+ for (UserPackage userPackage : userPackages) {
if (!userPackage.isInstalledPackage()) {
// Package uninstalled/hidden
return context.getString(