summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-11-08 05:36:30 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-11-08 05:36:30 -0800
commit977b9a9f105c3ec0ebb8ad8926cdae5fbe9f41c5 (patch)
tree185c15704bac16247cc23d32d3e97c720b3e1617
parent8b4c6b1d4a4f7d4beb742870449ff67a81452a55 (diff)
parent9e18412c2e003f444d222c6d77b8a8988abfcef6 (diff)
downloadandroid_frameworks_opt_bluetooth-977b9a9f105c3ec0ebb8ad8926cdae5fbe9f41c5.tar.gz
android_frameworks_opt_bluetooth-977b9a9f105c3ec0ebb8ad8926cdae5fbe9f41c5.tar.bz2
android_frameworks_opt_bluetooth-977b9a9f105c3ec0ebb8ad8926cdae5fbe9f41c5.zip
Merge "MAPC: Handle NPE from TestClient for setNotificationReg event"
-rw-r--r--src/android/bluetooth/client/map/BluetoothMasClient.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/android/bluetooth/client/map/BluetoothMasClient.java b/src/android/bluetooth/client/map/BluetoothMasClient.java
index 70e49ef..a7563cc 100644
--- a/src/android/bluetooth/client/map/BluetoothMasClient.java
+++ b/src/android/bluetooth/client/map/BluetoothMasClient.java
@@ -452,11 +452,8 @@ public class BluetoothMasClient {
}
private void sendToClient(int event, boolean success, Object param) {
- if (success) {
- mCallback.obtainMessage(event, STATUS_OK, mMas.getId(), param).sendToTarget();
- } else {
- mCallback.obtainMessage(event, STATUS_FAILED, mMas.getId(), null).sendToTarget();
- }
+ mCallback.obtainMessage(event, success ? STATUS_OK : STATUS_FAILED, mMas.getId(),
+ param).sendToTarget();
}
private class SocketConnectThread extends Thread {