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/accessibility/ShortcutServicePickerFragment.java
View File

@@ -47,7 +47,6 @@ import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.util.ArrayList;
import java.util.List;
@@ -229,10 +228,9 @@ public class ShortcutServicePickerFragment extends RadioButtonPickerFragment {
@Override
public CharSequence loadLabel() {
final PackageManagerWrapper pmw =
new PackageManagerWrapper(getContext().getPackageManager());
final PackageManager pmw = getContext().getPackageManager();
final CharSequence label =
mServiceInfo.getResolveInfo().serviceInfo.loadLabel(pmw.getPackageManager());
mServiceInfo.getResolveInfo().serviceInfo.loadLabel(pmw);
if (label != null) {
return label;
}
@@ -242,7 +240,7 @@ public class ShortcutServicePickerFragment extends RadioButtonPickerFragment {
try {
final ApplicationInfo appInfo = pmw.getApplicationInfoAsUser(
componentName.getPackageName(), 0, UserHandle.myUserId());
return appInfo.loadLabel(pmw.getPackageManager());
return appInfo.loadLabel(pmw);
} catch (PackageManager.NameNotFoundException e) {
return null;
}