commit 16a0e416fd3e446370b050a258901a76753f123d
author Lei Yu <jackqdyulei@google.com> Mon Sep 17 22:16:00 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 17 22:16:00 2018 +0000
tree 82f5a69869a2bcfcd45e8e5b88b43c4553c8a442
parent 8dbbb01f19b52fe575e641c21791c2c0d495eb64
parent 499013b05ecd844429b3852f720f04ee0494e66d

Merge "Revert "call getName() from CachedBluetoothDevice, not CachedBluetoothDeviceManager""

src/com/android/settings/bluetooth/BluetoothPairingController.java

diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java
index 95c97e2..c39f1d9 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -85,7 +85,7 @@
 
         mType = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, BluetoothDevice.ERROR);
         mPasskey = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_KEY, BluetoothDevice.ERROR);
-        mDeviceName = mBluetoothManager.getCachedDeviceManager().findDevice(mDevice).getName();
+        mDeviceName = mBluetoothManager.getCachedDeviceManager().getName(mDevice);
         mPbapClientProfile = mBluetoothManager.getProfileManager().getPbapClientProfile();
         mPasskeyFormatted = formatKey(mPasskey);
     }

tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
index 4dc5805..b28a8b2 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
@@ -15,13 +15,10 @@
  */
 package com.android.settings.bluetooth;
 
-import static com.google.common.truth.Truth.assertThat;
-
 import static android.bluetooth.BluetoothDevice.PAIRING_VARIANT_CONSENT;
 
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
@@ -30,7 +27,6 @@
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
 import com.android.settings.testutils.shadow.ShadowBluetoothPan;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -43,12 +39,10 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class})
 public class BluetoothPairingControllerTest {
-    private final static String DEVICE_NAME = "TestName";
     @Mock
     private BluetoothDevice mBluetoothDevice;
     private Context mContext;
     private BluetoothPairingController mBluetoothPairingController;
-    private LocalBluetoothManager mBluetoothManager;
 
     @Before
     public void setUp() {
@@ -57,9 +51,6 @@
         mContext = RuntimeEnvironment.application;
         final Intent intent = new Intent();
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
-        mBluetoothManager = Utils.getLocalBtManager(mContext);
-        when(mBluetoothDevice.getAliasName()).thenReturn(DEVICE_NAME);
-        mBluetoothManager.getCachedDeviceManager().addDevice(mBluetoothDevice);
         mBluetoothPairingController = spy(new BluetoothPairingController(intent, mContext));
     }
 
@@ -72,9 +63,4 @@
 
         verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
     }
-
-    @Test
-    public void onGetDeviceName() {
-        assertThat(mBluetoothPairingController.getDeviceName()).isEqualTo(DEVICE_NAME);
-    }
 }