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

7
src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
View File

@@ -33,7 +33,6 @@ import android.view.View;
import com.android.settings.R;
import com.android.settings.vpn2.VpnUtils;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.util.Date;
import java.util.List;
@@ -42,7 +41,7 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
private final Context mContext;
private final DevicePolicyManager mDpm;
private final PackageManagerWrapper mPm;
private final PackageManager mPm;
private final UserManager mUm;
private final ConnectivityManager mCm;
private final Resources mResources;
@@ -50,7 +49,7 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
private static final int MY_USER_ID = UserHandle.myUserId();
public EnterprisePrivacyFeatureProviderImpl(Context context, DevicePolicyManager dpm,
PackageManagerWrapper pm, UserManager um, ConnectivityManager cm,
PackageManager pm, UserManager um, ConnectivityManager cm,
Resources resources) {
mContext = context.getApplicationContext();
mDpm = dpm;
@@ -194,7 +193,7 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
}
try {
return mPm.getApplicationInfoAsUser(packageName, 0 /* flags */, MY_USER_ID)
.loadLabel(mPm.getPackageManager()).toString();
.loadLabel(mPm).toString();
} catch (PackageManager.NameNotFoundException e) {
return null;
}