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

9
src/com/android/settings/development/LocalTerminalPreferenceController.java
View File

@@ -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) {