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

13
src/com/android/settings/applications/assist/DefaultAssistPicker.java
View File

@@ -134,12 +134,11 @@ public class DefaultAssistPicker extends DefaultAppPickerFragment {
}
private void addAssistServices() {
final PackageManager pm = mPm.getPackageManager();
final List<ResolveInfo> services = pm.queryIntentServices(
final List<ResolveInfo> services = mPm.queryIntentServices(
ASSIST_SERVICE_PROBE, PackageManager.GET_META_DATA);
for (ResolveInfo resolveInfo : services) {
VoiceInteractionServiceInfo voiceInteractionServiceInfo =
new VoiceInteractionServiceInfo(pm, resolveInfo.serviceInfo);
new VoiceInteractionServiceInfo(mPm, resolveInfo.serviceInfo);
if (!voiceInteractionServiceInfo.getSupportsAssist()) {
continue;
}
@@ -152,8 +151,7 @@ public class DefaultAssistPicker extends DefaultAppPickerFragment {
}
private void addAssistActivities() {
final PackageManager pm = mPm.getPackageManager();
final List<ResolveInfo> activities = pm.queryIntentActivities(
final List<ResolveInfo> activities = mPm.queryIntentActivities(
ASSIST_ACTIVITY_PROBE, PackageManager.MATCH_DEFAULT_ONLY);
for (ResolveInfo resolveInfo : activities) {
mAvailableAssistants.add(new Info(
@@ -206,9 +204,8 @@ public class DefaultAssistPicker extends DefaultAppPickerFragment {
}
private String getDefaultRecognizer() {
final ResolveInfo resolveInfo = mPm.getPackageManager().resolveService(
new Intent(RecognitionService.SERVICE_INTERFACE),
PackageManager.GET_META_DATA);
final ResolveInfo resolveInfo = mPm.resolveService(
new Intent(RecognitionService.SERVICE_INTERFACE), PackageManager.GET_META_DATA);
if (resolveInfo == null || resolveInfo.serviceInfo == null) {
Log.w(TAG, "Unable to resolve default voice recognition service.");
return "";

7
src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
View File

@@ -58,13 +58,12 @@ public class DefaultAssistPreferenceController extends DefaultAppPreferenceContr
final Intent probe = new Intent(VoiceInteractionService.SERVICE_INTERFACE)
.setPackage(cn.getPackageName());
final PackageManager pm = mPackageManager.getPackageManager();
final List<ResolveInfo> services = pm.queryIntentServices(probe, PackageManager
.GET_META_DATA);
final List<ResolveInfo> services = mPackageManager.queryIntentServices(probe,
PackageManager.GET_META_DATA);
if (services == null || services.isEmpty()) {
return null;
}
final String activity = getAssistSettingsActivity(cn, services.get(0), pm);
final String activity = getAssistSettingsActivity(cn, services.get(0), mPackageManager);
if (activity == null) {
return null;
}

4
src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.applications.assist;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.provider.Settings;
import android.text.TextUtils;
@@ -27,7 +28,6 @@ import com.android.internal.logging.nano.MetricsProto;
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;
@@ -139,7 +139,7 @@ public class DefaultVoiceInputPicker extends DefaultAppPickerFragment {
public VoiceInputHelper.BaseInfo mInfo;
public VoiceInputDefaultAppInfo(Context context, PackageManagerWrapper pm, int userId,
public VoiceInputDefaultAppInfo(Context context, PackageManager pm, int userId,
VoiceInputHelper.BaseInfo info, boolean enabled) {
super(context, pm, userId, info.componentName, null /* summary */, enabled);
mInfo = info;