Replace PackageManagerWrapper with PackageManager

Replace all SettingsLib/PackageManagerWrapper
by PackageManager in SettingsLib.
Because some other apps still use wrapper,
Do not remove it right now.

Bug: 62067063
Test: make RunSettingsLibRoboTests
Change-Id: Ia0e727e88a8ea44a0cd740d8bd0930ab9cc522ba

4 files changed, 14 insertions, 20 deletions

diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/DefaultAppInfo.java b/packages/SettingsLib/src/com/android/settingslib/applications/DefaultAppInfo.java
index 246ca474da32..afc08f451623 100644
--- a/packages/SettingsLib/src/com/android/settingslib/applications/DefaultAppInfo.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/DefaultAppInfo.java
@@ -40,18 +40,18 @@ public class DefaultAppInfo extends CandidateInfo {
     public final ComponentName componentName;
     public final PackageItemInfo packageItemInfo;
     public final String summary;
-    protected final PackageManagerWrapper mPm;
+    protected final PackageManager mPm;
     private final Context mContext;
 
-    public DefaultAppInfo(Context context, PackageManagerWrapper pm, int uid, ComponentName cn) {
+    public DefaultAppInfo(Context context, PackageManager pm, int uid, ComponentName cn) {
         this(context, pm, uid, cn, null /* summary */, true /* enabled */);
     }
 
-    public DefaultAppInfo(Context context, PackageManagerWrapper pm, PackageItemInfo info) {
+    public DefaultAppInfo(Context context, PackageManager pm, PackageItemInfo info) {
         this(context, pm, info, null /* summary */, true /* enabled */);
     }
 
-    public DefaultAppInfo(Context context, PackageManagerWrapper pm, int uid, ComponentName cn,
+    public DefaultAppInfo(Context context, PackageManager pm, int uid, ComponentName cn,
                           String summary, boolean enabled) {
         super(enabled);
         mContext = context;
@@ -62,7 +62,7 @@ public class DefaultAppInfo extends CandidateInfo {
         this.summary = summary;
     }
 
-    public DefaultAppInfo(Context context, PackageManagerWrapper pm, PackageItemInfo info,
+    public DefaultAppInfo(Context context, PackageManager pm, PackageItemInfo info,
                           String summary, boolean enabled) {
         super(enabled);
         mContext = context;
@@ -79,17 +79,17 @@ public class DefaultAppInfo extends CandidateInfo {
             try {
                 final ComponentInfo componentInfo = getComponentInfo();
                 if (componentInfo != null) {
-                    return componentInfo.loadLabel(mPm.getPackageManager());
+                    return componentInfo.loadLabel(mPm);
                 } else {
                     final ApplicationInfo appInfo = mPm.getApplicationInfoAsUser(
                             componentName.getPackageName(), 0, userId);
-                    return appInfo.loadLabel(mPm.getPackageManager());
+                    return appInfo.loadLabel(mPm);
                 }
             } catch (PackageManager.NameNotFoundException e) {
                 return null;
             }
         } else if (packageItemInfo != null) {
-            return packageItemInfo.loadLabel(mPm.getPackageManager());
+            return packageItemInfo.loadLabel(mPm);
         } else {
             return null;
         }
diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ServiceListing.java b/packages/SettingsLib/src/com/android/settingslib/applications/ServiceListing.java
index 3c3c70ac364e..454d1dce0b2f 100644
--- a/packages/SettingsLib/src/com/android/settingslib/applications/ServiceListing.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/ServiceListing.java
@@ -32,8 +32,6 @@ import android.os.Handler;
 import android.provider.Settings;
 import android.util.Slog;
 
-import com.android.settingslib.wrapper.PackageManagerWrapper;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -127,8 +125,7 @@ public class ServiceListing {
         mServices.clear();
         final int user = ActivityManager.getCurrentUser();
 
-        final PackageManagerWrapper pmWrapper =
-                new PackageManagerWrapper(mContext.getPackageManager());
+        final PackageManager pmWrapper = mContext.getPackageManager();
         List<ResolveInfo> installedServices = pmWrapper.queryIntentServicesAsUser(
                 new Intent(mIntentAction),
                 PackageManager.GET_SERVICES | PackageManager.GET_META_DATA,
diff --git a/packages/SettingsLib/src/com/android/settingslib/wrapper/PackageManagerWrapper.java b/packages/SettingsLib/src/com/android/settingslib/wrapper/PackageManagerWrapper.java
index 235daf23a664..4e22473a8c87 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wrapper/PackageManagerWrapper.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wrapper/PackageManagerWrapper.java
@@ -35,6 +35,8 @@ import java.util.List;
  * and the PackageManager. This class only provides access to the minimum number of functions from
  * the PackageManager needed for DeletionHelper to work.
  */
+@Deprecated
+// Please replace with android.content.pm.PackageManager
 public class PackageManagerWrapper {
 
     private final PackageManager mPm;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/DefaultAppInfoTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/DefaultAppInfoTest.java
index 6a161d0a645c..01f0d78ede1a 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/DefaultAppInfoTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/DefaultAppInfoTest.java
@@ -33,7 +33,6 @@ import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 
 import com.android.settingslib.SettingsLibRobolectricTestRunner;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -41,7 +40,6 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 @RunWith(SettingsLibRobolectricTestRunner.class)
 public class DefaultAppInfoTest {
@@ -53,8 +51,6 @@ public class DefaultAppInfoTest {
     @Mock
     private PackageManager mPackageManager;
     @Mock
-    private PackageManagerWrapper mPackageManagerWrapper;
-    @Mock
     private ApplicationInfo mApplicationInfo;
     @Mock
     private Drawable mIcon;
@@ -67,8 +63,7 @@ public class DefaultAppInfoTest {
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
         doReturn(mPackageManager).when(mContext).getPackageManager();
-        when(mPackageManagerWrapper.getPackageManager()).thenReturn(mPackageManager);
-        when(mPackageManagerWrapper.getApplicationInfoAsUser(anyString(), anyInt(),
+        when(mPackageManager.getApplicationInfoAsUser(anyString(), anyInt(),
                 anyInt())).thenReturn(mApplicationInfo);
         when(mPackageManager.loadUnbadgedItemIcon(mPackageItemInfo, mApplicationInfo)).thenReturn(
                 mIcon);
@@ -77,7 +72,7 @@ public class DefaultAppInfoTest {
     @Test
     public void initInfoWithActivityInfo_shouldLoadInfo() {
         mPackageItemInfo.packageName = "test";
-        mInfo = new DefaultAppInfo(mContext, mPackageManagerWrapper, mPackageItemInfo);
+        mInfo = new DefaultAppInfo(mContext, mPackageManager, mPackageItemInfo);
         mInfo.loadLabel();
         Drawable icon = mInfo.loadIcon();
 
@@ -90,7 +85,7 @@ public class DefaultAppInfoTest {
     public void initInfoWithComponent_shouldLoadInfo() {
         when(mComponentName.getPackageName()).thenReturn("com.android.settings");
 
-        mInfo = new DefaultAppInfo(mContext, mPackageManagerWrapper, 0 /* uid */, mComponentName);
+        mInfo = new DefaultAppInfo(mContext, mPackageManager, 0 /* uid */, mComponentName);
         mInfo.getKey();
 
         verify(mComponentName).flattenToString();