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

Commit 1b040fa9 authored by Ang Li's avatar Ang Li Committed by Android Git Automerger
Browse files

am cf55f02f: am 11d075f2: Merge "Change broadcast... 

am cf55f02f: am 11d075f2: Merge "Change broadcast ACTION_CONNECTION_ACCESS_REQUEST to be ordered." into lmp-dev

* commit 'cf55f02f':
  Change broadcast ACTION_CONNECTION_ACCESS_REQUEST to be ordered.
parents 836820a9 cf55f02f

android/app/src/com/android/bluetooth/hfp/AtPhonebook.java

+1 −1
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ public class AtPhonebook { 
        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, remoteDevice);

        // Leave EXTRA_PACKAGE_NAME and EXTRA_CLASS_NAME field empty

        // BluetoothHandsfree's broadcast receiver is anonymous, cannot be targeted

        mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);

        mContext.sendOrderedBroadcast(intent, BLUETOOTH_ADMIN_PERM);

        return false;

    }

android/app/src/com/android/bluetooth/map/BluetoothMapService.java

+1 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ public class BluetoothMapService extends ProfileService { 
            intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,

                            BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS);

            intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mRemoteDevice);

            sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);

            sendOrderedBroadcast(intent, BLUETOOTH_ADMIN_PERM);



            if (DEBUG) Log.d(TAG, "waiting for authorization for connection from: "

                    + sRemoteDeviceName);

android/app/src/com/android/bluetooth/pbap/BluetoothPbapService.java

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ public class BluetoothPbapService extends Service { 
                                        BluetoothPbapReceiver.class.getName());



                        isWaitingAuthorization = true;

                        sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);

                        sendOrderedBroadcast(intent, BLUETOOTH_ADMIN_PERM);



                        if (VERBOSE) Log.v(TAG, "waiting for authorization for connection from: "

                                + sRemoteDeviceName);