Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55db646c authored by Natalie Silvanovich's avatar Natalie Silvanovich
Browse files

Null checks in register/unregister BT Adapters 

Prevents system crash

Bug: 13743852
Change-Id: I05bcb31fc8377866b93899a01c004d15e041f21f
parent 61bc9f37

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

+8 −0
Original line number Diff line number Diff line
@@ -307,6 +307,10 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    }



    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 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    }



    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);