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

Commit f461f594 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Changing params for SendBroadcastMultiplePermissions" am: f00cdfe1 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2137790



Change-Id: I116d0ed5f1bac6939ed4bc150c64fed7e72b9203
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c978496 f00cdfe1

android/app/src/com/android/bluetooth/Utils.java

+11 −2
Original line number Diff line number Diff line
@@ -982,7 +982,17 @@ public final class Utils { 
        return 1 == context.getContentResolver().update(uri, values, null, null);

    }



    /**

     * Returns bundled broadcast options.

     */

    public static @NonNull Bundle getTempAllowlistBroadcastOptions() {

        return getTempBroadcastOptions().toBundle();

    }



    /**

     * Returns broadcast options.

     */

    public static @NonNull BroadcastOptions getTempBroadcastOptions() {

        // Use the Bluetooth process identity to pass permission check when reading DeviceConfig

        final long ident = Binder.clearCallingIdentity();

        final BroadcastOptions bOptions = BroadcastOptions.makeBasic();
@@ -995,9 +1005,8 @@ public final class Utils { 
        } finally {

            Binder.restoreCallingIdentity(ident);

        }

        return bOptions.toBundle();

        return bOptions;

    }



    /**

     * Checks that value is present as at least one of the elements of the array.

     * @param array the array to check in

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

+2 −2
Original line number Diff line number Diff line
@@ -718,11 +718,11 @@ final class RemoteDevices { 
                if (pkg.getPermission() != null) {

                    sAdapterService.sendBroadcastMultiplePermissions(intent,

                            new String[] { BLUETOOTH_SCAN, pkg.getPermission() },

                            Utils.getTempAllowlistBroadcastOptions());

                            Utils.getTempBroadcastOptions());

                } else {

                    sAdapterService.sendBroadcastMultiplePermissions(intent,

                            new String[] { BLUETOOTH_SCAN },

                            Utils.getTempAllowlistBroadcastOptions());

                            Utils.getTempBroadcastOptions());

                }

            }

        }

android/app/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -1934,7 +1934,7 @@ public class HeadsetClientStateMachine extends StateMachine { 


        mService.sendBroadcastMultiplePermissions(intent,

                new String[] {BLUETOOTH_CONNECT, BLUETOOTH_PRIVILEGED},

                Utils.getTempAllowlistBroadcastOptions());

                Utils.getTempBroadcastOptions());



        HfpClientConnectionService.onConnectionStateChanged(device, newState, prevState);

    }

android/app/src/com/android/bluetooth/mapclient/MceStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ class MceStateMachine extends StateMachine { 
        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

        mService.sendBroadcastMultiplePermissions(intent,

                new String[] {BLUETOOTH_CONNECT, BLUETOOTH_PRIVILEGED},

                Utils.getTempAllowlistBroadcastOptions());

                Utils.getTempBroadcastOptions());

    }



    public synchronized int getState() {

android/app/src/com/android/bluetooth/pbapclient/PbapClientStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ final class PbapClientStateMachine extends StateMachine { 
        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

        mService.sendBroadcastMultiplePermissions(intent,

                new String[] {BLUETOOTH_CONNECT, BLUETOOTH_PRIVILEGED},

                Utils.getTempAllowlistBroadcastOptions());

                Utils.getTempBroadcastOptions());

    }



    public void disconnect(BluetoothDevice device) {