diff options
| author | HJ ChangLiao <hjchangliao@google.com> | 2018-04-24 15:12:31 +0800 |
|---|---|---|
| committer | HJ ChangLiao <hjchangliao@google.com> | 2018-04-24 15:12:31 +0800 |
| commit | 5693be28630c6d0780b4ef454d5d4f01b133da4b (patch) | |
| tree | a3c5906dd2c4b07aef76afe652c4ab526c03a9b5 /src/com/android/settings/development/LocalTerminalPreferenceController.java | |
| parent | bb2c8a31475ad20fc95d5f8ae6666134e184caa3 (diff) | |
Replace PackageManagerWrapper with PackageManager
Replace all SettingsLib/PackageManagerWrapper in Settings,
by PackageManager,
Remove ShadowPackageManagerWrapper.
Bug: 62067063
Test: make RunSettingsRoboTests
Change-Id: I6d1af55c13d80c1907b98b21e0207cc903cd9b1f
Diffstat (limited to 'src/com/android/settings/development/LocalTerminalPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/development/LocalTerminalPreferenceController.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/settings/development/LocalTerminalPreferenceController.java b/src/com/android/settings/development/LocalTerminalPreferenceController.java index be60ed7c18..362b97b2f0 100644 --- a/src/com/android/settings/development/LocalTerminalPreferenceController.java +++ b/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) { |