Merge "Use BluetoothAdapter instead of LocalBluetoothAdapter"

diff --cc src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
index 558e7cb,a2623e3..d8e2e79
--- 1/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
--- 2/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
@@@ -27,11 -27,8 +27,9 @@@ import android.text.SpannedString
  
  import com.android.settings.bluetooth.BluetoothLengthDeviceNameFilter;
  import com.android.settings.core.BasePreferenceController;
 +import com.android.settings.R;
  import com.android.settings.widget.ValidatedEditTextPreference;
  import com.android.settings.wifi.tether.WifiDeviceNameTextValidator;
- import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
- import com.android.settingslib.bluetooth.LocalBluetoothManager;
  import com.android.settingslib.core.lifecycle.LifecycleObserver;
  import com.android.settingslib.core.lifecycle.events.OnCreate;
  import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;

diff --cc src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
index 68b48a8,4268d94..3ca06aa
--- 1/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
--- 2/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
@@@ -16,12 -16,8 +16,10 @@@
  
  package com.android.settings.deviceinfo;
  
 +import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 +import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
  import static com.google.common.truth.Truth.assertThat;
  import static org.mockito.ArgumentMatchers.anyString;
- import static org.mockito.ArgumentMatchers.eq;
- import static org.mockito.Mockito.never;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;