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

Commit 54060ad6 authored by Roman Birg's avatar Roman Birg Committed by Pat Erley
Browse files

Bluetooth: fix opp NPE 




Ticket: CYNGNOS-2866

Change-Id: I7ffd329564713adf25b2033291a21546321df5df
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
(cherry picked from commit 072643fb)
parent 6a046b44

src/com/android/bluetooth/OolConnManager.java

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public class OolConnManager { 


        Log.v(TAG,"saveOppSdpRecord"+ btDevice.getAddress());

        if ((mAddress != null) && mAddress.equalsIgnoreCase(btDevice.getAddress())) {

           channel = sdpRec.getL2capPsm();

           channel = sdpRec != null ? sdpRec.getL2capPsm() : -1;

           sdpDone = true;

           Log.d(TAG,"saveOppSdpRecord channel "+ channel);

        }

src/com/android/bluetooth/opp/BluetoothOppManager.java

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class BluetoothOppManager { 
    private static BluetoothOppManager INSTANCE;



    /** Used when obtaining a reference to the singleton instance. */

    private static Object INSTANCE_LOCK = new Object();

    private static final Object INSTANCE_LOCK = new Object();



    private boolean mInitialized;