Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07c12804 authored by Rahul Sabnis's avatar Rahul Sabnis Committed by android-build-merger
Browse files

Merge "Revert "Re-add getAliasName to fix build breakage"" am: 944fed6b

am: 87dd39f1

Change-Id: I289fe08f8d7cc744d864cb77ce7ad3a2ae96263a
parents d26ea880 87dd39f1
Loading
Loading
Loading
Loading
+0 −18
Original line number Diff line number Diff line
@@ -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}