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

Commit 219b5f64 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "mcp: Fix null pointer exception" am: 24982535 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1916442

Change-Id: I683a804f8d0ad9eb4db24eb2dbd56e68a04de878
parents a5b78eaf 24982535

android/app/src/com/android/bluetooth/mcp/MediaControlGattService.java

+1 −1
Original line number Diff line number Diff line
@@ -1119,7 +1119,7 @@ public class MediaControlGattService implements MediaControlGattServiceInterface 


        if (stateFields.containsKey(PlayerStateField.PLAYER_NAME)) {

            String name = (String) stateFields.get(PlayerStateField.PLAYER_NAME);

            if (name.compareTo(getPlayerNameChar()) != 0) {

            if ((getPlayerNameChar() != null) && (name.compareTo(getPlayerNameChar()) != 0)) {

                updatePlayerNameChar(name, doNotifyValueChange);



                // Most likely the player has changed - request critical info fields

android/app/tests/unit/src/com/android/bluetooth/mcp/MediaControlGattServiceTest.java

+21 −0
Original line number Diff line number Diff line
@@ -1137,4 +1137,25 @@ public class MediaControlGattServiceTest { 
                .sendResponse(eq(mCurrentDevice), eq(1),

                        eq(BluetoothGatt.GATT_INSUFFICIENT_AUTHORIZATION), eq(0), any());

    }



    @Test

    public void testUpdatePlayerNameFromNull() {

        BluetoothGattService service = initAllFeaturesGattService();



        BluetoothGattCharacteristic characteristic =

                service.getCharacteristic(MediaControlGattService.UUID_PLAYER_NAME);

        Assert.assertNotNull(characteristic);

        byte[] nullname = null;

        characteristic.setValue(nullname);



        prepareConnectedDevice();

        doReturn(BluetoothDevice.ACCESS_ALLOWED)

                .when(mMockMcpService)

                .getDeviceAuthorization(any(BluetoothDevice.class));



        Map<PlayerStateField, Object> state_map = new HashMap<>();

        String player_name = "TestPlayerName";

        state_map.put(PlayerStateField.PLAYER_NAME, player_name);

        mMcpService.updatePlayerState(state_map);

    }

}