diff options
author | Jack He <siyuanh@google.com> | 2018-10-10 17:42:33 -0700 |
---|---|---|
committer | Hansong Zhang <hsz@google.com> | 2018-10-11 21:06:29 +0000 |
commit | 097a89513ecc2a454775a0fef2193396d5892c0b (patch) | |
tree | 0bf10dc992c7764fc65f76224b04981ea5d59c63 | |
parent | e9f1e8c12389b79aa9d829caf8ac0e753888adaa (diff) | |
download | base-097a89513ecc2a454775a0fef2193396d5892c0b.tar.gz |
Remove BluetoothDevice.ACTION_DISAPPEARED
This intent was never sent by the Bluetooth stack
Fixes: 112115770
Test: make
Change-Id: Iaf71aeafa21f44ec9b59c1b766c936ab7dde39f1
3 files changed, 0 insertions, 16 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 73e98cd99f8f..d9e6fa203823 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -107,20 +107,6 @@ public final class BluetoothDevice implements Parcelable { "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 * #EXTRA_CLASS}. diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 22194cc2ebbd..0dabcd72bd86 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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" /> diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java index cdaabdcda20f..d0ca04bb07c2 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java @@ -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); |