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

Commit f6a578cd authored by Edward Jee's avatar Edward Jee Committed by Android Git Automerger
Browse files

am b01e167e: am fb999187: Allows another GMS core app to handle ACTION_PAIRING_REQUEST . 

* commit 'b01e167e':
  Allows another GMS core app to handle ACTION_PAIRING_REQUEST .
parents df978760 b01e167e

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

+4 −4
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ final class RemoteDevices { 
        intent.putExtra(BluetoothDevice.EXTRA_PAIRING_KEY, pin);

        intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,

                    BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN);

        mAdapterService.sendBroadcast(intent, mAdapterService.BLUETOOTH_ADMIN_PERM);

        mAdapterService.sendOrderedBroadcast(intent, mAdapterService.BLUETOOTH_PRIVILEGED_PERM);

    }



    void devicePropertyChangedCallback(byte[] address, int[] types, byte[][] values) {
@@ -354,7 +354,7 @@ final class RemoteDevices { 
        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, getDevice(address));

        intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,

                BluetoothDevice.PAIRING_VARIANT_PIN);

        mAdapterService.sendBroadcast(intent, mAdapterService.BLUETOOTH_ADMIN_PERM);

        mAdapterService.sendOrderedBroadcast(intent, mAdapterService.BLUETOOTH_PRIVILEGED_PERM);

        return;

    }
@@ -396,7 +396,7 @@ final class RemoteDevices { 
            intent.putExtra(BluetoothDevice.EXTRA_PAIRING_KEY, passkey);

        }

        intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, variant);

        mAdapterService.sendBroadcast(intent, mAdapterService.BLUETOOTH_ADMIN_PERM);

        mAdapterService.sendOrderedBroadcast(intent, mAdapterService.BLUETOOTH_PRIVILEGED_PERM);

    }



    void aclStateChangeCallback(int status, byte[] address, int newState) {