diff options
| author | Roman Birg <roman@cyngn.com> | 2016-06-01 13:40:15 -0700 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2016-12-30 16:48:59 +0200 |
| commit | e2c7de9762741e0200dbe62965ba66154aab380a (patch) | |
| tree | 70ee644fccbf3b3fbca1f73a76d342aab6a8f835 | |
| parent | d219b0cb8990f82cb825087857459c671c05a85c (diff) | |
| download | android_packages_apps_Bluetooth-e2c7de9762741e0200dbe62965ba66154aab380a.tar.gz android_packages_apps_Bluetooth-e2c7de9762741e0200dbe62965ba66154aab380a.tar.bz2 android_packages_apps_Bluetooth-e2c7de9762741e0200dbe62965ba66154aab380a.zip | |
Bluetooth: fix opp NPE
Ticket: CYNGNOS-2866
Change-Id: I7ffd329564713adf25b2033291a21546321df5df
Signed-off-by: Roman Birg <roman@cyngn.com>
| -rw-r--r-- | src/com/android/bluetooth/OolConnManager.java | 2 | ||||
| -rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/bluetooth/OolConnManager.java b/src/com/android/bluetooth/OolConnManager.java index c0b56e143..9fd1e5292 100644 --- a/src/com/android/bluetooth/OolConnManager.java +++ b/src/com/android/bluetooth/OolConnManager.java @@ -91,7 +91,7 @@ public class OolConnManager { Log.i(TAG, "saveOppSdpRecord" + btDevice.getAddress() + " sdpRec:" + sdpRec); if (sdpRec != null && (mAddress != null) && mAddress. equalsIgnoreCase(btDevice.getAddress())) { - channel = sdpRec.getL2capPsm(); + channel = sdpRec != null ? sdpRec.getL2capPsm() : -1; sdpDone = true; Log.d(TAG,"saveOppSdpRecord channel "+ channel); } diff --git a/src/com/android/bluetooth/opp/BluetoothOppManager.java b/src/com/android/bluetooth/opp/BluetoothOppManager.java index 3e8b28417..82c6e16cf 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppManager.java +++ b/src/com/android/bluetooth/opp/BluetoothOppManager.java @@ -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; |