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

Commit 9b1510cc authored by Łukasz Rymanowski's avatar Łukasz Rymanowski
Browse files

gtbs: Fix crash when setting null uri 

01-14 16:33:18.500 E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'int java.lang.String.length()' on a null object reference
01-14 16:33:18.500 E AndroidRuntime: 	at com.android.bluetooth.tbs.TbsGatt.setIncomingCall(TbsGatt.java:579)
01-14 16:33:18.500 E AndroidRuntime: 	at com.android.bluetooth.tbs.TbsGeneric.callAdded(TbsGeneric.java:421)

Bug: 214637136
Test: compile
Change-Id: Icae1520d68ec33d026dff3bd518a7b919a8b84d3
parent a84bfeaf

android/app/src/com/android/bluetooth/tbs/TbsGatt.java

+10 −2
Original line number Diff line number Diff line
@@ -584,9 +584,17 @@ public class TbsGatt { 
        if (DBG) {

            Log.d(TAG, "setIncomingCall: callIndex=" + callIndex + " uri=" + uri);

        }

        byte[] value = new byte[uri.length() + 1];

        int uri_len = 0;

        if (uri != null) {

            uri_len = uri.length();

        }



        byte[] value = new byte[uri_len + 1];

        value[0] = (byte) (callIndex & 0xff);

        System.arraycopy(uri.getBytes(), 0, value, 1, uri.length());



        if (uri_len > 0) {

            System.arraycopy(uri.getBytes(), 0, value, 1, uri_len);

        }



        return mIncomingCallCharacteristic.setValue(value);

    }