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

Commit 9d30d542 authored by Ugo Yu's avatar Ugo Yu Committed by Myles Watson
Browse files

Synchronize adapter registration with mCallbacks 

Move register/unregister callback to the caller thread.
This fixes a problem that if an app registers adapter while the
BluetoothManagerService is turning on Bluetooth, the app would
get a null IBluetooth and would not receive any callback after
Bluetooth is turned on.

Bug: 149890859
Test: Manual
Change-Id: Ia79f6bd1fd6ffab814a15053aeaae031faf875dd
parent bc501515

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

+30 −40
Original line number Diff line number Diff line
@@ -113,8 +113,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    private static final int MESSAGE_DISABLE = 2;

    private static final int MESSAGE_HANDLE_ENABLE_DELAYED = 3;

    private static final int MESSAGE_HANDLE_DISABLE_DELAYED = 4;

    private static final int MESSAGE_REGISTER_ADAPTER = 20;

    private static final int MESSAGE_UNREGISTER_ADAPTER = 21;

    private static final int MESSAGE_REGISTER_STATE_CHANGE_CALLBACK = 30;

    private static final int MESSAGE_UNREGISTER_STATE_CHANGE_CALLBACK = 31;

    private static final int MESSAGE_BLUETOOTH_SERVICE_CONNECTED = 40;
@@ -590,10 +588,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
            Slog.w(TAG, "Callback is null in registerAdapter");

            return null;

        }

        Message msg = mHandler.obtainMessage(MESSAGE_REGISTER_ADAPTER);

        msg.obj = callback;

        mHandler.sendMessage(msg);



        synchronized (mCallbacks) {

            mCallbacks.register(callback);

        }

        return mBluetooth;

    }
@@ -603,9 +600,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
            return;

        }

        mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        Message msg = mHandler.obtainMessage(MESSAGE_UNREGISTER_ADAPTER);

        msg.obj = callback;

        mHandler.sendMessage(msg);

        synchronized (mCallbacks) {

            mCallbacks.unregister(callback);

        }

    }



    public void registerStateChangeCallback(IBluetoothStateChangeCallback callback) {
@@ -1478,6 +1475,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
     * Inform BluetoothAdapter instances that Adapter service is up

     */

    private void sendBluetoothServiceUpCallback() {

        synchronized (mCallbacks) {

            try {

                int n = mCallbacks.beginBroadcast();

                Slog.d(TAG, "Broadcasting onBluetoothServiceUp() to " + n + " receivers.");
@@ -1492,11 +1490,13 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                mCallbacks.finishBroadcast();

            }

        }

    }



    /**

     * Inform BluetoothAdapter instances that Adapter service is down

     */

    private void sendBluetoothServiceDownCallback() {

        synchronized (mCallbacks) {

            try {

                int n = mCallbacks.beginBroadcast();

                Slog.d(TAG, "Broadcasting onBluetoothServiceDown() to " + n + " receivers.");
@@ -1511,6 +1511,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                mCallbacks.finishBroadcast();

            }

        }

    }



    public String getAddress() {

        mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
@@ -1836,17 +1837,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                                mContext.getPackageName());

                    }

                    break;



                case MESSAGE_REGISTER_ADAPTER: {

                    IBluetoothManagerCallback callback = (IBluetoothManagerCallback) msg.obj;

                    mCallbacks.register(callback);

                    break;

                }

                case MESSAGE_UNREGISTER_ADAPTER: {

                    IBluetoothManagerCallback callback = (IBluetoothManagerCallback) msg.obj;

                    mCallbacks.unregister(callback);

                    break;

                }

                case MESSAGE_REGISTER_STATE_CHANGE_CALLBACK: {

                    IBluetoothStateChangeCallback callback =

                            (IBluetoothStateChangeCallback) msg.obj;