Merge "DO NOT MERGE Revert "Merge "Revert "Re-add getAliasName to fix build... (35505f61) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothDevice.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -1094,6 +1094,24 @@ 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}