Merge "Refactor methods to access/modify BluetoothDevice alias and name" am:... (4573f2ad) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothDevice.java

+13 −28

Original line number	Diff line number	Diff line
		@@ -173,13 +173,10 @@ public final class BluetoothDevice implements Parcelable {
		* changed.
		* <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_ALIAS_CHANGED =
		"android.bluetooth.device.action.ALIAS_CHANGED";
		"android.bluetooth.action.ALIAS_CHANGED";

		/**
		* Broadcast Action: Indicates a change in the bond state of a remote
		@@ -1048,10 +1045,11 @@ public final class BluetoothDevice implements Parcelable {
		* Get the Bluetooth alias of the remote device.
		* <p>Alias is the locally modified name of a remote device.
		*
		* @return the Bluetooth alias, or null if no alias or there was a problem
		* @hide
		* @return the Bluetooth alias, the friendly device name if no alias, or
		* null if there was a problem
		*/
		@UnsupportedAppUsage(publicAlternatives = "Use {@link #getName()} instead.")
		@Nullable
		@RequiresPermission(Manifest.permission.BLUETOOTH)
		public String getAlias() {
		final IBluetooth service = sService;
		if (service == null) {
		@@ -1059,7 +1057,11 @@ public final class BluetoothDevice implements Parcelable {
		return null;
		}
		try {
		return service.getRemoteAlias(this);
		String alias = service.getRemoteAlias(this);
		if (alias == null) {
		return getName();
		}
		return alias;
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		}
		@@ -1076,8 +1078,9 @@ public final class BluetoothDevice implements Parcelable {
		* @return true on success, false on error
		* @hide
		*/
		@UnsupportedAppUsage
		public boolean setAlias(String alias) {
		@SystemApi
		@RequiresPermission(Manifest.permission.BLUETOOTH)
		public boolean setAlias(@NonNull String alias) {
		final IBluetooth service = sService;
		if (service == null) {
		Log.e(TAG, "BT not enabled. Cannot set Remote Device name");
		@@ -1091,24 +1094,6 @@ public final class BluetoothDevice implements Parcelable {
		return false;
		}

		/**
		* Get the Bluetooth alias of the remote device.
		* If Alias is null, get the Bluetooth name instead.
		*
		* @return the Bluetooth alias, or null if no alias or there was a problem
		* @hide
		* @see #getAlias()
		* @see #getName()
		*/
		@UnsupportedAppUsage(publicAlternatives = "Use {@link #getName()} instead.")
		public String getAliasName() {
		String name = getAlias();
		if (name == null) {
		name = getName();
		}
		return name;
		}

		/**
		* Get the most recent identified battery level of this Bluetooth device
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}