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

6
src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
View File

@@ -23,6 +23,7 @@ import android.app.DialogFragment;
import android.app.Fragment;
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Pair;
@@ -34,19 +35,18 @@ import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.wrapper.PackageManagerWrapper;
/**
* A generic app picker fragment that shows a list of app as radio button group.
*/
public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment {
protected PackageManagerWrapper mPm;
protected PackageManager mPm;
@Override
public void onAttach(Context context) {
super.onAttach(context);
mPm = new PackageManagerWrapper(context.getPackageManager());
mPm = context.getPackageManager();
}
@Override

6
src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
View File

@@ -20,6 +20,7 @@ import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
import android.os.UserManager;
@@ -34,21 +35,20 @@ import com.android.settings.widget.GearPreference;
import com.android.settingslib.TwoTargetPreference;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
public abstract class DefaultAppPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
private static final String TAG = "DefaultAppPrefControl";
protected final PackageManagerWrapper mPackageManager;
protected final PackageManager mPackageManager;
protected final UserManager mUserManager;
protected int mUserId;
public DefaultAppPreferenceController(Context context) {
super(context);
mPackageManager = new PackageManagerWrapper(context.getPackageManager());
mPackageManager = context.getPackageManager();
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
mUserId = UserHandle.myUserId();
}

6
src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
View File

@@ -72,7 +72,7 @@ public class DefaultBrowserPreferenceController extends DefaultAppPreferenceCont
final String packageName = mPackageManager.getDefaultBrowserPackageNameAsUser(mUserId);
Log.d(TAG, "Get default browser package: " + packageName);
return new DefaultAppInfo(mContext, mPackageManager,
mPackageManager.getPackageManager().getApplicationInfo(packageName, 0));
mPackageManager.getApplicationInfo(packageName, 0));
} catch (PackageManager.NameNotFoundException e) {
return null;
}
@@ -113,7 +113,7 @@ public class DefaultBrowserPreferenceController extends DefaultAppPreferenceCont
final List<ResolveInfo> list = getCandidates();
if (list != null && list.size() == 1) {
final ResolveInfo info = list.get(0);
final String label = info.loadLabel(mPackageManager.getPackageManager()).toString();
final String label = info.loadLabel(mPackageManager).toString();
final ComponentInfo cn = info.getComponentInfo();
final String packageName = cn == null ? null : cn.packageName;
Log.d(TAG, "Getting label for the only browser app: " + packageName + label);
@@ -133,7 +133,7 @@ public class DefaultBrowserPreferenceController extends DefaultAppPreferenceCont
}
final ApplicationInfo appInfo;
try {
appInfo = mPackageManager.getPackageManager().getApplicationInfo(packageName, 0);
appInfo = mPackageManager.getApplicationInfo(packageName, 0);
} catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, "Error getting app info for " + packageName);
return null;

4
src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java
View File

@@ -49,14 +49,14 @@ public class DefaultEmergencyPicker extends DefaultAppPickerFragment {
@Override
protected List<DefaultAppInfo> getCandidates() {
final List<DefaultAppInfo> candidates = new ArrayList<>();
final List<ResolveInfo> infos = mPm.getPackageManager().queryIntentActivities(
final List<ResolveInfo> infos = mPm.queryIntentActivities(
DefaultEmergencyPreferenceController.QUERY_INTENT, 0);
PackageInfo bestMatch = null;
final Context context = getContext();
for (ResolveInfo info : infos) {
try {
final PackageInfo packageInfo =
mPm.getPackageManager().getPackageInfo(info.activityInfo.packageName, 0);
mPm.getPackageInfo(info.activityInfo.packageName, 0);
final ApplicationInfo appInfo = packageInfo.applicationInfo;
candidates.add(new DefaultAppInfo(context, mPm, appInfo));
// Get earliest installed system app.

2
src/com/android/settings/applications/defaultapps/DefaultEmergencyPreferenceController.java
View File

@@ -41,7 +41,7 @@ public class DefaultEmergencyPreferenceController extends DefaultAppPreferenceCo
public boolean isAvailable() {
return DEFAULT_EMERGENCY_APP_IS_CONFIGURABLE
&& isCapable()
&& mPackageManager.getPackageManager().resolveActivity(QUERY_INTENT, 0) != null;
&& mPackageManager.resolveActivity(QUERY_INTENT, 0) != null;
}
@Override

4
src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
View File

@@ -138,8 +138,8 @@ public class DefaultHomePicker extends DefaultAppPickerFragment {
private boolean launcherHasManagedProfilesFeature(ResolveInfo resolveInfo) {
try {
ApplicationInfo appInfo = mPm.getPackageManager().getApplicationInfo(
resolveInfo.activityInfo.packageName, 0 /* default flags */);
ApplicationInfo appInfo = mPm.getApplicationInfo(resolveInfo.activityInfo.packageName,
0 /* default flags */);
return versionNumberAtLeastL(appInfo.targetSdkVersion);
} catch (PackageManager.NameNotFoundException e) {
return false;

3
src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
View File

@@ -26,7 +26,6 @@ import android.content.pm.ResolveInfo;
import com.android.settings.R;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.util.ArrayList;
import java.util.List;
@@ -121,7 +120,7 @@ public class DefaultHomePreferenceController extends DefaultAppPreferenceControl
return false;
}
public static boolean isHomeDefault(String pkg, PackageManagerWrapper pm) {
public static boolean isHomeDefault(String pkg, PackageManager pm) {
final ArrayList<ResolveInfo> homeActivities = new ArrayList<>();
ComponentName def = pm.getHomeActivities(homeActivities);

6
src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java
View File

@@ -59,10 +59,8 @@ public class DefaultPhonePreferenceController extends DefaultAppPreferenceContro
@Override
protected DefaultAppInfo getDefaultAppInfo() {
try {
return new DefaultAppInfo(mContext, mPackageManager,
mPackageManager.getPackageManager().getApplicationInfo(
DefaultDialerManager.getDefaultDialerApplication(mContext, mUserId),
0));
return new DefaultAppInfo(mContext, mPackageManager, mPackageManager.getApplicationInfo(
DefaultDialerManager.getDefaultDialerApplication(mContext, mUserId), 0));
} catch (PackageManager.NameNotFoundException e) {
return null;
}