diff options
| author | Roman Birg <roman@cyngn.com> | 2016-06-01 13:40:15 -0700 |
|---|---|---|
| committer | Pat Erley <perley@cyngn.com> | 2016-06-13 11:36:10 -0700 |
| commit | 54060ad6a36a4a2bcfe6fb0866ebb1d81cc9546d (patch) | |
| tree | e7643b1857749654fd27fe21f7ffab153db9b98b | |
| parent | 6a046b44e2fe07d23df263c5dfa69968821978e5 (diff) | |
| download | android_packages_apps_Bluetooth-54060ad6a36a4a2bcfe6fb0866ebb1d81cc9546d.tar.gz android_packages_apps_Bluetooth-54060ad6a36a4a2bcfe6fb0866ebb1d81cc9546d.tar.bz2 android_packages_apps_Bluetooth-54060ad6a36a4a2bcfe6fb0866ebb1d81cc9546d.zip | |
Bluetooth: fix opp NPE
Ticket: CYNGNOS-2866
Change-Id: I7ffd329564713adf25b2033291a21546321df5df
Signed-off-by: Roman Birg <roman@cyngn.com>
(cherry picked from commit 072643fb5918d4f096d7534abf8022001b7519a3)
| -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; |