Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e97c21b5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update the method name from isA2dpDevice() to isConnectedA2dpDevice()"

parents b45a9e95 156d52e1

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

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater 
            // show the bluetooth device that have headset profile.

            switch (currentAudioProfile) {

                case BluetoothProfile.A2DP:

                    isFilterMatched = cachedDevice.isA2dpDevice();

                    isFilterMatched = cachedDevice.isConnectedA2dpDevice();

                    break;

                case BluetoothProfile.HEADSET:

                    isFilterMatched = cachedDevice.isConnectedHfpDevice();

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

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater { 
            // show the bluetooth device that doesn't have headset profile.

            switch (currentAudioProfile) {

                case BluetoothProfile.A2DP:

                    isFilterMatched = !cachedDevice.isA2dpDevice();

                    isFilterMatched = !cachedDevice.isConnectedA2dpDevice();

                    break;

                case BluetoothProfile.HEADSET:

                    isFilterMatched = !cachedDevice.isConnectedHfpDevice();

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

+4 −4
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);

        mCachedDevices.add(mCachedBluetoothDevice);



        mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -138,7 +138,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);

        mCachedDevices.add(mCachedBluetoothDevice);



        mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -151,7 +151,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);



        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,

                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
@@ -164,7 +164,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);



        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,

                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);

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

+4 −4
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public class ConnectedBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);

        mCachedDevices.add(mCachedBluetoothDevice);



        mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -136,7 +136,7 @@ public class ConnectedBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);

        mCachedDevices.add(mCachedBluetoothDevice);



        mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -149,7 +149,7 @@ public class ConnectedBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);



        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,

                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
@@ -162,7 +162,7 @@ public class ConnectedBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);



        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,

                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);