Merge "Revert "Re-add getAliasName to fix build breakage"" am: 944fed6b66 am: 87dd39f1bc

am: 07c1280421

Change-Id: I5eba169aebff220a2d3dc6cff08fbd3bc6ef78e7

core/java/android/bluetooth/BluetoothDevice.java

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