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

Commit 7ccf46be authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am: 2ac8c8a3 am: 24591d26 

am: 94405bb1

Change-Id: Ie2dd54ebdd4cd71ca89d263ec738f6c4a90cfac7
parents f3fee9c0 94405bb1

core/java/android/bluetooth/BluetoothDevice.java

+0 −14
Original line number Diff line number Diff line
@@ -106,20 +106,6 @@ public final class BluetoothDevice implements Parcelable { 
    public static final String ACTION_FOUND =

            "android.bluetooth.device.action.FOUND";



    /**

     * Broadcast Action: Remote device disappeared.

     * <p>Sent when a remote device that was found in the last discovery is not

     * found in the current discovery.

     * <p>Always contains the extra field {@link #EXTRA_DEVICE}.

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive.

     *

     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @UnsupportedAppUsage

    public static final String ACTION_DISAPPEARED =

            "android.bluetooth.device.action.DISAPPEARED";



    /**

     * Broadcast Action: Bluetooth class of a remote device has changed.

     * <p>Always contains the extra fields {@link #EXTRA_DEVICE} and {@link

core/res/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ 
    <protected-broadcast android:name="android.bluetooth.device.action.MAS_INSTANCE" />

    <protected-broadcast android:name="android.bluetooth.device.action.ALIAS_CHANGED" />

    <protected-broadcast android:name="android.bluetooth.device.action.FOUND" />

    <protected-broadcast android:name="android.bluetooth.device.action.DISAPPEARED" />

    <protected-broadcast android:name="android.bluetooth.device.action.CLASS_CHANGED" />

    <protected-broadcast android:name="android.bluetooth.device.action.ACL_CONNECTED" />

    <protected-broadcast android:name="android.bluetooth.device.action.ACL_DISCONNECT_REQUESTED" />

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java

+0 −1
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ public class DeviceDiscoveryService extends Service { 
        if (shouldScan(mBluetoothFilters)) {

            final IntentFilter intentFilter = new IntentFilter();

            intentFilter.addAction(BluetoothDevice.ACTION_FOUND);

            intentFilter.addAction(BluetoothDevice.ACTION_DISAPPEARED);



            mBluetoothBroadcastReceiver = new BluetoothBroadcastReceiver();

            registerReceiver(mBluetoothBroadcastReceiver, intentFilter);