diff options
| author | 2020-01-30 17:04:54 -0800 | |
|---|---|---|
| committer | 2020-01-31 10:38:02 -0800 | |
| commit | e75a016d1b6cda8cf9450e05d80f8c27f3cc88e9 (patch) | |
| tree | 005049b77fd206955a7157586414b19c3a34d878 | |
| parent | 0b242c8d77c329e1c3bc28475e86120026212b99 (diff) | |
Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to
android.bluetooth.device.action.ALIAS_CHANGED from
android.bluetooth.action.ALIAS_CHANGED
Bug: 146158681
Test: Manual
Change-Id: Ie247568ff3e5a750d74f22636aca69e3e74a55f5
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index ce28b957aaae..2cd396907bc7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8372,7 +8372,7 @@ package android.bluetooth { field public static final String ACTION_ACL_CONNECTED = "android.bluetooth.device.action.ACL_CONNECTED"; field public static final String ACTION_ACL_DISCONNECTED = "android.bluetooth.device.action.ACL_DISCONNECTED"; field public static final String ACTION_ACL_DISCONNECT_REQUESTED = "android.bluetooth.device.action.ACL_DISCONNECT_REQUESTED"; - field public static final String ACTION_ALIAS_CHANGED = "android.bluetooth.action.ALIAS_CHANGED"; + field public static final String ACTION_ALIAS_CHANGED = "android.bluetooth.device.action.ALIAS_CHANGED"; field public static final String ACTION_BOND_STATE_CHANGED = "android.bluetooth.device.action.BOND_STATE_CHANGED"; field public static final String ACTION_CLASS_CHANGED = "android.bluetooth.device.action.CLASS_CHANGED"; field public static final String ACTION_FOUND = "android.bluetooth.device.action.FOUND"; diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 12dc814c3416..1872ae03ee97 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -23,6 +23,7 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; +import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; @@ -179,9 +180,10 @@ public final class BluetoothDevice implements Parcelable { * <p>Always contains the extra field {@link #EXTRA_DEVICE}. * <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive. */ + @SuppressLint("ActionValue") @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_ALIAS_CHANGED = - "android.bluetooth.action.ALIAS_CHANGED"; + "android.bluetooth.device.action.ALIAS_CHANGED"; /** * Broadcast Action: Indicates a change in the bond state of a remote |