commit bc8169b0553e7bcdc061ebdbf586da432983b2fb
author Natalie Silvanovich <natashenka@google.com> Mon Jun 16 16:56:53 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 14 02:21:10 2014 +0000
tree 33b852e588119084accca1e6670737f903e3ebc8
parent f31c1da4ad78d9a8282ffe7888d96af8a944fb90
parent 55db646c4e43fd24386bf522aef13c0b3075593c

Merge "Null checks in register/unregister BT Adapters"

services/core/java/com/android/server/BluetoothManagerService.java

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index e2a8ca2..07c9048 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -308,6 +308,10 @@
     }
 
     public IBluetooth registerAdapter(IBluetoothManagerCallback callback){
+        if (callback == null) {
+            Log.w(TAG, "Callback is null in registerAdapter");
+            return null;
+        }
         Message msg = mHandler.obtainMessage(MESSAGE_REGISTER_ADAPTER);
         msg.obj = callback;
         mHandler.sendMessage(msg);
@@ -317,6 +321,10 @@
     }
 
     public void unregisterAdapter(IBluetoothManagerCallback callback) {
+        if (callback == null) {
+            Log.w(TAG, "Callback is null in unregisterAdapter");
+            return;
+        }
         mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM,
                                                 "Need BLUETOOTH permission");
         Message msg = mHandler.obtainMessage(MESSAGE_UNREGISTER_ADAPTER);