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

Commit 2735e4a7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove key_missing_broadcast" into main

parents 6de95601 95be1521

android/app/src/com/android/bluetooth/btservice/RemoteDevices.java

+0 −4
Original line number Diff line number Diff line
@@ -1381,10 +1381,6 @@ public class RemoteDevices { 
        Log.i(TAG, "keyMissingCallback device: " + bluetoothDevice);



        if (getBondState(bluetoothDevice) == BluetoothDevice.BOND_BONDED) {

            if (!Flags.keyMissingBroadcast()) {

                Log.d(TAG, "flag not set - don't send key missing broadcast");

                return;

            }

            Intent intent =

                    new Intent(BluetoothDevice.ACTION_KEY_MISSING)

                            .putExtra(BluetoothDevice.EXTRA_DEVICE, bluetoothDevice)

flags/framework.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -27,14 +27,6 @@ flag { 
    bug: "319716512"

}



flag {

    name: "key_missing_broadcast"

    is_exported: true

    namespace: "bluetooth"

    description: "Broadcast when remote device it lost bond"

    bug: "311447399"

}



flag {

    name: "identity_address_null_if_not_known"

    namespace: "bluetooth"

framework/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ package android.bluetooth { 
    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_ACCESS_CANCEL = "android.bluetooth.device.action.CONNECTION_ACCESS_CANCEL";

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_ACCESS_REPLY = "android.bluetooth.device.action.CONNECTION_ACCESS_REPLY";

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_ACCESS_REQUEST = "android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST";

    field @FlaggedApi("com.android.bluetooth.flags.key_missing_broadcast") @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public static final String ACTION_KEY_MISSING = "android.bluetooth.device.action.KEY_MISSING";

    field @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public static final String ACTION_KEY_MISSING = "android.bluetooth.device.action.KEY_MISSING";

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_PAIRING_CANCEL = "android.bluetooth.device.action.PAIRING_CANCEL";

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_SILENCE_MODE_CHANGED = "android.bluetooth.device.action.SILENCE_MODE_CHANGED";

    field @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public static final String ACTION_SWITCH_BUFFER_SIZE = "android.bluetooth.device.action.SWITCH_BUFFER_SIZE";

framework/java/android/bluetooth/BluetoothDevice.java

+0 −1
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_KEY_MISSING_BROADCAST)

    @SuppressLint("ActionValue")

    @RequiresPermission(allOf = {BLUETOOTH_CONNECT, BLUETOOTH_PRIVILEGED})

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)