diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-15 18:40:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-15 18:40:34 +0000 |
| commit | 5fc90f41b7fe76a2db3686ca505bc86a16dcdfff (patch) | |
| tree | 12572a803a258e162674847d8eaad1b0dfae421c /src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java | |
| parent | 35e60570c8eb62cc493508938ef896e0f90611f2 (diff) | |
| parent | 86da788df680d10e6be67e260e9a665e4c595e0a (diff) | |
Merge cherrypicks of [17129063, 17118783] into sc-v2-release. am: 86da788df6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17199011
Change-Id: I05dcf2e8b5a396cdffa514007967d4da25a69fac
Diffstat (limited to 'src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java b/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java index be7704fd73..7c3d3b120e 100644 --- a/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java +++ b/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java @@ -24,7 +24,7 @@ import android.os.UserHandle; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settingslib.RestrictedSwitchPreference; +import com.android.settingslib.RestrictedPreference; import com.android.settingslib.development.DeveloperOptionsPreferenceController; public class DefaultUsbConfigurationPreferenceController extends @@ -32,7 +32,7 @@ public class DefaultUsbConfigurationPreferenceController extends private static final String PREFERENCE_KEY = "default_usb_configuration"; - private RestrictedSwitchPreference mPreference; + private RestrictedPreference mPreference; public DefaultUsbConfigurationPreferenceController(Context context) { super(context); |