Merge "Re-add getAliasName to fix build breakage"

am: e905264d3c

Change-Id: Icda73f1ab221523248249f88fb9f0f4dd5da3a19

core/java/android/bluetooth/BluetoothDevice.java

@@ -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}