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

Commit 211eaf2c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "AdapterProperties: Guard unregisterReceiver"

parents efc8007b 82e0712f

android/app/src/com/android/bluetooth/btservice/AdapterProperties.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -93,6 +93,7 @@ class AdapterProperties { 
    private boolean mIsLePeriodicAdvertisingSupported;

    private boolean mIsLePeriodicAdvertisingSupported;

    private int mLeMaximumAdvertisingDataLength;

    private int mLeMaximumAdvertisingDataLength;





    private boolean mReceiverRegistered;

    private BroadcastReceiver mReceiver = new BroadcastReceiver() {

    private BroadcastReceiver mReceiver = new BroadcastReceiver() {

        @Override

        @Override

        public void onReceive(Context context, Intent intent) {

        public void onReceive(Context context, Intent intent) {
@@ -158,6 +159,7 @@ class AdapterProperties { 
        filter.addAction(BluetoothPbapClient.ACTION_CONNECTION_STATE_CHANGED);

        filter.addAction(BluetoothPbapClient.ACTION_CONNECTION_STATE_CHANGED);

        filter.addAction(BluetoothDevice.ACTION_UUID);

        filter.addAction(BluetoothDevice.ACTION_UUID);

        mService.registerReceiver(mReceiver, filter);

        mService.registerReceiver(mReceiver, filter);

        mReceiverRegistered = true;

    }

    }





    public void cleanup() {

    public void cleanup() {
@@ -166,7 +168,10 @@ class AdapterProperties { 
            mProfileConnectionState.clear();

            mProfileConnectionState.clear();

            mProfileConnectionState = null;

            mProfileConnectionState = null;

        }

        }

        if (mReceiverRegistered) {

            mService.unregisterReceiver(mReceiver);

            mService.unregisterReceiver(mReceiver);

            mReceiverRegistered = false;

        }

        mService = null;

        mService = null;

        mBondedDevices.clear();

        mBondedDevices.clear();

    }

    }