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

Commit 8752cb4f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to... 

Merge "Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to android.bluetooth.device.action.ALIAS_CHANGED from android.bluetooth.action.ALIAS_CHANGED" am: ea711aba

Change-Id: Ib585b2b8831e12ba8231704a99a47ceaf0da0e8e
parents 2dc9a569 ea711aba

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8372,7 +8372,7 @@ package android.bluetooth { 
    field public static final String ACTION_ACL_CONNECTED = "android.bluetooth.device.action.ACL_CONNECTED";

    field public static final String ACTION_ACL_DISCONNECTED = "android.bluetooth.device.action.ACL_DISCONNECTED";

    field public static final String ACTION_ACL_DISCONNECT_REQUESTED = "android.bluetooth.device.action.ACL_DISCONNECT_REQUESTED";

    field public static final String ACTION_ALIAS_CHANGED = "android.bluetooth.action.ALIAS_CHANGED";

    field public static final String ACTION_ALIAS_CHANGED = "android.bluetooth.device.action.ALIAS_CHANGED";

    field public static final String ACTION_BOND_STATE_CHANGED = "android.bluetooth.device.action.BOND_STATE_CHANGED";

    field public static final String ACTION_CLASS_CHANGED = "android.bluetooth.device.action.CLASS_CHANGED";

    field public static final String ACTION_FOUND = "android.bluetooth.device.action.FOUND";

core/java/android/bluetooth/BluetoothDevice.java

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.Nullable; 
import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;
@@ -179,9 +180,10 @@ public final class BluetoothDevice implements Parcelable { 
     * <p>Always contains the extra field {@link #EXTRA_DEVICE}.

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive.

     */

    @SuppressLint("ActionValue")

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_ALIAS_CHANGED =

            "android.bluetooth.action.ALIAS_CHANGED";

            "android.bluetooth.device.action.ALIAS_CHANGED";



    /**

     * Broadcast Action: Indicates a change in the bond state of a remote