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/connecteddevice/AddDevicePreferenceController.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/connecteddevice/AddDevicePreferenceController.java')
| -rw-r--r-- | src/com/android/settings/connecteddevice/AddDevicePreferenceController.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java index 9730515343..9706c1798c 100644 --- a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java @@ -21,11 +21,12 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; @@ -67,7 +68,7 @@ public class AddDevicePreferenceController extends BasePreferenceController public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); if (isAvailable()) { - mPreference = (Preference) screen.findPreference(getPreferenceKey()); + mPreference = screen.findPreference(getPreferenceKey()); } } |