PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace PackageManagerWrapper with PackageManager

Browse Source 
Replace all SettingsLib/PackageManagerWrapper in Settings,
by PackageManager,
Remove ShadowPackageManagerWrapper.

Bug: 62067063
Test: make RunSettingsRoboTests
Change-Id: I6d1af55c13d80c1907b98b21e0207cc903cd9b1f
This commit is contained in:
HJ ChangLiao
2018-04-24 15:12:31 +08:00
parent bb2c8a3147
commit 5693be2863
68 changed files with 181 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/webview/WebViewAppPicker.java
View File

@@ -33,7 +33,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.util.ArrayList;
import java.util.List;
@@ -118,7 +117,7 @@ public class WebViewAppPicker extends DefaultAppPickerFragment {
}
private static class WebViewAppInfo extends DefaultAppInfo {
public WebViewAppInfo(Context context, PackageManagerWrapper pm,
public WebViewAppInfo(Context context, PackageManager pm,
PackageItemInfo packageItemInfo, String summary, boolean enabled) {
super(context, pm, packageItemInfo, summary, enabled);
}
@@ -127,8 +126,7 @@ public class WebViewAppPicker extends DefaultAppPickerFragment {
public CharSequence loadLabel() {
String versionName = "";
try {
versionName = mPm.getPackageManager().
getPackageInfo(packageItemInfo.packageName, 0).versionName;
versionName = mPm.getPackageInfo(packageItemInfo.packageName, 0).versionName;
} catch (PackageManager.NameNotFoundException e) {
}
return String.format("%s %s", super.loadLabel(), versionName);
@@ -137,7 +135,7 @@ public class WebViewAppPicker extends DefaultAppPickerFragment {
@VisibleForTesting
DefaultAppInfo createDefaultAppInfo(Context context, PackageManagerWrapper pm,
DefaultAppInfo createDefaultAppInfo(Context context, PackageManager pm,
PackageItemInfo packageItemInfo, String disabledReason) {
return new WebViewAppInfo(context, pm, packageItemInfo, disabledReason,
TextUtils.isEmpty(disabledReason) /* enabled */);