commit 24fe135adce66ec47af8c7c5e3379e27ab71bf05
author Natalie Silvanovich <natashenka@google.com> Thu May 01 16:12:23 2014 -0700
committer Natalie Silvanovich <natashenka@google.com> Thu May 01 16:26:09 2014 -0700
tree f525ff2e1ad3925377ee280a5673e6f448f6dc1d
parent a48ea16502da2767437ba5fc0def5d09a5583083

Null checks in register/unregister BT Adapters

Prevents system crash

Bug: 13743852
Change-Id: I05bcb31fc8377866b93899a01c004d15e041f21f

service/java/com/android/server/bluetooth/BluetoothManagerService.java

diff --git a/service/java/com/android/server/bluetooth/BluetoothManagerService.java b/service/java/com/android/server/bluetooth/BluetoothManagerService.java
index 0d6f548..f22020f 100644
--- a/service/java/com/android/server/bluetooth/BluetoothManagerService.java
+++ b/service/java/com/android/server/bluetooth/BluetoothManagerService.java
@@ -307,6 +307,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);
@@ -316,6 +320,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);