diff options
| author | Xin Li <delphij@google.com> | 2019-09-05 16:53:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-05 16:53:18 +0000 |
| commit | d7a8e234e9b94ff36cd271555a0bbf8a01a10932 (patch) | |
| tree | b6c98b0e3e76f797dbc57e77a8aac776ca1d1324 /src/com/android/settings/development/LocalTerminalPreferenceController.java | |
| parent | 1e53efc4c48ec80421bb0542b770332ab8efdab5 (diff) | |
| parent | 7195e05dfaf1c848a7af9b844cd8bd05e9c220fe (diff) | |
| download | packages_apps_Settings-d7a8e234e9b94ff36cd271555a0bbf8a01a10932.tar.gz packages_apps_Settings-d7a8e234e9b94ff36cd271555a0bbf8a01a10932.tar.bz2 packages_apps_Settings-d7a8e234e9b94ff36cd271555a0bbf8a01a10932.zip | |
Merge "DO NOT MERGE - Merge Android 10 into master"
Diffstat (limited to 'src/com/android/settings/development/LocalTerminalPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/development/LocalTerminalPreferenceController.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/settings/development/LocalTerminalPreferenceController.java b/src/com/android/settings/development/LocalTerminalPreferenceController.java index be60ed7c18..d48615c7fc 100644 --- a/src/com/android/settings/development/LocalTerminalPreferenceController.java +++ b/src/com/android/settings/development/LocalTerminalPreferenceController.java @@ -3,14 +3,14 @@ package com.android.settings.development; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; 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 +20,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 +43,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 +82,8 @@ public class LocalTerminalPreferenceController extends DeveloperOptionsPreferenc } @VisibleForTesting - PackageManagerWrapper getPackageManagerWrapper() { - return new PackageManagerWrapper(mContext.getPackageManager()); + PackageManager getPackageManager() { + return mContext.getPackageManager(); } private boolean isPackageInstalled(String packageName) { |