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

Commit dd1c592f authored by timhypeng's avatar timhypeng Committed by tim peng
Browse files

Remove BluetoothDevice.ACTION_DISAPPEARED from SettingLibs 

- this was only for Android Ice Cream Sandwich

Bug: 112115770
Test: make -j42 RunSettingsLibRoboTests
Change-Id: I6c2b87529af7e6a7123cde8141fbdb9d1822ec9f
parent 0cf90160

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

+1 −3
Original line number Diff line number Diff line
@@ -57,9 +57,7 @@ public interface BluetoothCallback { 
    default void onDeviceAdded(CachedBluetoothDevice cachedDevice) {}



    /**

     * It will be called when a remote device that was

     * found in the last discovery and is not found in the current discovery.

     * It is listening {@link android.bluetooth.BluetoothDevice#ACTION_DISAPPEARED}

     * It will be called when requiring to remove a remote device from CachedBluetoothDevice list

     *

     * @param cachedDevice the Bluetooth device.

     */

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

+0 −19
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ public class BluetoothEventManager { 
        addHandler(BluetoothAdapter.ACTION_DISCOVERY_STARTED, new ScanningStateChangedHandler(true));

        addHandler(BluetoothAdapter.ACTION_DISCOVERY_FINISHED, new ScanningStateChangedHandler(false));

        addHandler(BluetoothDevice.ACTION_FOUND, new DeviceFoundHandler());

        addHandler(BluetoothDevice.ACTION_DISAPPEARED, new DeviceDisappearedHandler());

        addHandler(BluetoothDevice.ACTION_NAME_CHANGED, new NameChangedHandler());

        addHandler(BluetoothDevice.ACTION_ALIAS_CHANGED, new NameChangedHandler());
@@ -299,24 +298,6 @@ public class BluetoothEventManager { 
        }

    }



    private class DeviceDisappearedHandler implements Handler {

        public void onReceive(Context context, Intent intent,

                BluetoothDevice device) {

            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);

            if (cachedDevice == null) {

                Log.w(TAG, "received ACTION_DISAPPEARED for an unknown device: " + device);

                return;

            }

            if (CachedBluetoothDeviceManager.onDeviceDisappeared(cachedDevice)) {

                synchronized (mCallbacks) {

                    for (BluetoothCallback callback : mCallbacks) {

                        callback.onDeviceDeleted(cachedDevice);

                    }

                }

            }

        }

    }



    private class NameChangedHandler implements Handler {

        public void onReceive(Context context, Intent intent,

                BluetoothDevice device) {