Replace PackageManagerWrapper with PackageManager
Replace all SettingsLib/PackageManagerWrapper in Settings, by PackageManager, Remove ShadowPackageManagerWrapper. Bug: 62067063 Test: make RunSettingsRoboTests Change-Id: I6d1af55c13d80c1907b98b21e0207cc903cd9b1f
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
Reference in New Issue
Block a user