Replace PackageManagerWrapper with PackageManager

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

Bug: 62067063
Test: make RunSettingsRoboTests
Change-Id: I6d1af55c13d80c1907b98b21e0207cc903cd9b1f

src/com/android/settings/development/LocalTerminalPreferenceController.java

@@ -10,7 +10,6 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 public class LocalTerminalPreferenceController extends DeveloperOptionsPreferenceController
         implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
@@ -20,7 +19,7 @@ public class LocalTerminalPreferenceController extends DeveloperOptionsPreferenc
     @VisibleForTesting
     static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
 
-    private PackageManagerWrapper mPackageManager;
+    private PackageManager mPackageManager;
     private UserManager mUserManager;
 
     public LocalTerminalPreferenceController(Context context) {
@@ -43,7 +42,7 @@ public class LocalTerminalPreferenceController extends DeveloperOptionsPreferenc
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
 
-        mPackageManager = getPackageManagerWrapper();
+        mPackageManager = getPackageManager();
 
         if (isAvailable() && !isEnabled()) {
             mPreference.setEnabled(false);
@@ -82,8 +81,8 @@ public class LocalTerminalPreferenceController extends DeveloperOptionsPreferenc
     }
 
     @VisibleForTesting
-    PackageManagerWrapper getPackageManagerWrapper() {
-        return new PackageManagerWrapper(mContext.getPackageManager());
+    PackageManager getPackageManager() {
+        return mContext.getPackageManager();
     }
 
     private boolean isPackageInstalled(String packageName) {

src/com/android/settings/development/MockLocationAppPreferenceController.java

@@ -32,7 +32,6 @@ import android.text.TextUtils;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.List;
 
@@ -44,7 +43,7 @@ public class MockLocationAppPreferenceController extends DeveloperOptionsPrefere
 
     private final DevelopmentSettingsDashboardFragment mFragment;
     private final AppOpsManager mAppsOpsManager;
-    private final PackageManagerWrapper mPackageManager;
+    private final PackageManager mPackageManager;
 
     public MockLocationAppPreferenceController(Context context,
             DevelopmentSettingsDashboardFragment fragment) {
@@ -52,7 +51,7 @@ public class MockLocationAppPreferenceController extends DeveloperOptionsPrefere
 
         mFragment = fragment;
         mAppsOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
-        mPackageManager = new PackageManagerWrapper(context.getPackageManager());
+        mPackageManager = context.getPackageManager();
     }
 
     @Override

src/com/android/settings/development/SelectDebugAppPreferenceController.java

@@ -31,7 +31,6 @@ import androidx.preference.Preference;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 public class SelectDebugAppPreferenceController extends DeveloperOptionsPreferenceController
         implements PreferenceControllerMixin, OnActivityResultListener {
@@ -39,13 +38,13 @@ public class SelectDebugAppPreferenceController extends DeveloperOptionsPreferen
     private static final String DEBUG_APP_KEY = "debug_app";
 
     private final DevelopmentSettingsDashboardFragment mFragment;
-    private final PackageManagerWrapper mPackageManager;
+    private final PackageManager mPackageManager;
 
     public SelectDebugAppPreferenceController(Context context,
             DevelopmentSettingsDashboardFragment fragment) {
         super(context);
         mFragment = fragment;
-        mPackageManager = new PackageManagerWrapper(mContext.getPackageManager());
+        mPackageManager = mContext.getPackageManager();
     }
 
     @Override

src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java

@@ -18,6 +18,7 @@ package com.android.settings.development;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -30,7 +31,6 @@ import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.List;
 
@@ -65,12 +65,12 @@ public class VerifyAppsOverUsbPreferenceController extends DeveloperOptionsPrefe
             new RestrictedLockUtilsDelegate();
 
     // This field is accessed using reflection in the test, please keep name in sync.
-    private final PackageManagerWrapper mPackageManager;
+    private final PackageManager mPackageManager;
 
     public VerifyAppsOverUsbPreferenceController(Context context) {
         super(context);
 
-        mPackageManager = new PackageManagerWrapper(context.getPackageManager());
+        mPackageManager = context.getPackageManager();
     }
 
     @Override

src/com/android/settings/development/WebViewAppPreferenceController.java

@@ -20,6 +20,8 @@ import android.content.Context;
 import android.content.pm.PackageInfo;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
+
+import android.content.pm.PackageManager;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -28,7 +30,6 @@ import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.webview.WebViewUpdateServiceWrapper;
 import com.android.settingslib.applications.DefaultAppInfo;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 public class WebViewAppPreferenceController extends DeveloperOptionsPreferenceController implements
         PreferenceControllerMixin {
@@ -36,13 +37,13 @@ public class WebViewAppPreferenceController extends DeveloperOptionsPreferenceCo
     private static final String TAG = "WebViewAppPrefCtrl";
     private static final String WEBVIEW_APP_KEY = "select_webview_provider";
 
-    private final PackageManagerWrapper mPackageManager;
+    private final PackageManager mPackageManager;
     private final WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper;
 
     public WebViewAppPreferenceController(Context context) {
         super(context);
 
-        mPackageManager = new PackageManagerWrapper(context.getPackageManager());
+        mPackageManager = context.getPackageManager();
         mWebViewUpdateServiceWrapper = new WebViewUpdateServiceWrapper();
     }