summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-11-19 18:51:36 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-11-19 18:51:36 -0800
commit39b3db4f264fa5a1108ac2ab7986193daf2f3a70 (patch)
tree1863d951af3c7c087a0c1a1f9e67a914667252b0
parent9c72953a7c9a2901b867195e411be1b10f878f21 (diff)
parent30d8c6ff20890779c8127e499aec2c137732ab0b (diff)
downloadandroid_packages_apps_BluetoothExt-39b3db4f264fa5a1108ac2ab7986193daf2f3a70.tar.gz
android_packages_apps_BluetoothExt-39b3db4f264fa5a1108ac2ab7986193daf2f3a70.tar.bz2
android_packages_apps_BluetoothExt-39b3db4f264fa5a1108ac2ab7986193daf2f3a70.zip
Merge "PBAP C: Fix klocwork issue"
-rw-r--r--bttestapp/src/org/codeaurora/bluetooth/bttestapp/ServicesFragment.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/bttestapp/src/org/codeaurora/bluetooth/bttestapp/ServicesFragment.java b/bttestapp/src/org/codeaurora/bluetooth/bttestapp/ServicesFragment.java
index f73e435..b9af571 100644
--- a/bttestapp/src/org/codeaurora/bluetooth/bttestapp/ServicesFragment.java
+++ b/bttestapp/src/org/codeaurora/bluetooth/bttestapp/ServicesFragment.java
@@ -461,10 +461,12 @@ public class ServicesFragment extends ListFragment {
case PBAP:
if (isChecked) {
- mActivity.mProfileService.getPbapClient().connect();
+ if (mActivity.mProfileService.getPbapClient()!= null)
+ mActivity.mProfileService.getPbapClient().connect();
buttonView.setEnabled(false);
} else {
- mActivity.mProfileService.getPbapClient().disconnect();
+ if (mActivity.mProfileService.getPbapClient()!= null)
+ mActivity.mProfileService.getPbapClient().disconnect();
buttonView.setEnabled(false);
}
break;