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

Commit 9a61dc1a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove mProfileManager in BluetoothEventManager"

parents 683fa6d1 804e7c1f

packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class A2dpProfile implements LocalBluetoothProfile { 
                // we may add a new device here, but generally this should not happen

                if (device == null) {

                    Log.w(TAG, "A2dpProfile found new device: " + nextDevice);

                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);

                    device = mDeviceManager.addDevice(mLocalAdapter, nextDevice);

                }

                device.onProfileStateChanged(A2dpProfile.this, BluetoothProfile.STATE_CONNECTED);

                device.refresh();

packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpSinkProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ final class A2dpSinkProfile implements LocalBluetoothProfile { 
                // we may add a new device here, but generally this should not happen

                if (device == null) {

                    Log.w(TAG, "A2dpSinkProfile found new device: " + nextDevice);

                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);

                    device = mDeviceManager.addDevice(mLocalAdapter, nextDevice);

                }

                device.onProfileStateChanged(A2dpSinkProfile.this, BluetoothProfile.STATE_CONNECTED);

                device.refresh();

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java

+4 −10
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ public class BluetoothEventManager { 
    private final BroadcastReceiver mProfileBroadcastReceiver = new BluetoothBroadcastReceiver();

    private final Collection<BluetoothCallback> mCallbacks = new ArrayList<>();



    private LocalBluetoothProfileManager mProfileManager;

    private android.os.Handler mReceiverHandler;

    private Context mContext;
@@ -141,11 +140,6 @@ public class BluetoothEventManager { 
        mProfileIntentFilter.addAction(action);

    }



    // Set profile manager after construction due to circular dependency

    void setProfileManager(LocalBluetoothProfileManager manager) {

        mProfileManager = manager;

    }



    boolean readPairedDevices() {

        Set<BluetoothDevice> bondedDevices = mLocalAdapter.getBondedDevices();

        if (bondedDevices == null) {
@@ -156,7 +150,7 @@ public class BluetoothEventManager { 
        for (BluetoothDevice device : bondedDevices) {

            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);

            if (cachedDevice == null) {

                cachedDevice = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, device);

                cachedDevice = mDeviceManager.addDevice(mLocalAdapter, device);

                dispatchDeviceAdded(cachedDevice);

                deviceAdded = true;

            }
@@ -288,7 +282,7 @@ public class BluetoothEventManager { 
            // Skip for now, there's a bluez problem and we are not getting uuids even for 2.1.

            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);

            if (cachedDevice == null) {

                cachedDevice = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, device);

                cachedDevice = mDeviceManager.addDevice(mLocalAdapter, device);

                Log.d(TAG, "DeviceFoundHandler created new CachedBluetoothDevice: "

                        + cachedDevice);

            }
@@ -355,7 +349,7 @@ public class BluetoothEventManager { 
                    Log.w(TAG, "Got bonding state changed for " + device +

                            ", but we have no record of that device.");



                    cachedDevice = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, device);

                    cachedDevice = mDeviceManager.addDevice(mLocalAdapter, device);

                    dispatchDeviceAdded(cachedDevice);

                }

            }

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java

+2 −3
Original line number Diff line number Diff line
@@ -107,9 +107,8 @@ public class CachedBluetoothDeviceManager { 
     * @param device the address of the new Bluetooth device

     * @return the newly created CachedBluetoothDevice object

     */

    public CachedBluetoothDevice addDevice(LocalBluetoothAdapter adapter,

            LocalBluetoothProfileManager profileManager,

            BluetoothDevice device) {

    public CachedBluetoothDevice addDevice(LocalBluetoothAdapter adapter, BluetoothDevice device) {

        LocalBluetoothProfileManager profileManager = mBtManager.getProfileManager();

        CachedBluetoothDevice newDevice = new CachedBluetoothDevice(mContext, adapter,

            profileManager, device);

        if (profileManager.getHearingAidProfile() != null

packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class HeadsetProfile implements LocalBluetoothProfile { 
                // we may add a new device here, but generally this should not happen

                if (device == null) {

                    Log.w(TAG, "HeadsetProfile found new device: " + nextDevice);

                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);

                    device = mDeviceManager.addDevice(mLocalAdapter, nextDevice);

                }

                device.onProfileStateChanged(HeadsetProfile.this,

                        BluetoothProfile.STATE_CONNECTED);