diff options
| author | Roman Birg <roman@cyngn.com> | 2016-06-01 13:40:15 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-06-10 16:22:49 -0700 |
| commit | 072643fb5918d4f096d7534abf8022001b7519a3 (patch) | |
| tree | 6280f3512a6dcc3a8fee5edf5be4df377d65e174 | |
| parent | 9792f9638a9d3f7dc84cb80182fa188d639d4ae5 (diff) | |
| download | android_packages_apps_Bluetooth-072643fb5918d4f096d7534abf8022001b7519a3.tar.gz android_packages_apps_Bluetooth-072643fb5918d4f096d7534abf8022001b7519a3.tar.bz2 android_packages_apps_Bluetooth-072643fb5918d4f096d7534abf8022001b7519a3.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 3609c53b3..55d26e56f 100644 --- a/src/com/android/bluetooth/OolConnManager.java +++ b/src/com/android/bluetooth/OolConnManager.java @@ -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); } diff --git a/src/com/android/bluetooth/opp/BluetoothOppManager.java b/src/com/android/bluetooth/opp/BluetoothOppManager.java index 8805818e5..ebbbfc8a1 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; |