Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" (3cbb8d7f) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothDevice.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -1112,6 +1112,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
		*

+0 −2

Original line number	Diff line number	Diff line
		@@ -671,8 +671,6 @@ public final class ScanFilter implements Parcelable {

		/**
		* Set filter on on manufacturerData. A negative manufacturerId is considered as invalid id.
		* <p>
		* Note the first two bytes of the {@code manufacturerData} is the manufacturerId.
		*
		* @throws IllegalArgumentException If the {@code manufacturerId} is invalid.
		*/