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

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

Merge changes I5917b91b,Ia6073398,I921a3a3b,I77888bd8,I7f6e8b9b into main am:... 

Merge changes I5917b91b,Ia6073398,I921a3a3b,I77888bd8,I7f6e8b9b into main am: eb55cc18 am: 53766288 am: 9d97cba2

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



Change-Id: I1daba4460d10054a884e65ec29c1400c80f8a07c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6fcd8dee 9d97cba2

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+139 −268

File changed.

Preview size limit exceeded, changes collapsed.

service/src/com/android/server/bluetooth/BluetoothServiceBinder.java

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ class BluetoothServiceBinder extends IBluetoothManager.Stub { 


    @Override

    public boolean disable(AttributionSource source, boolean persist) {

        requireNonNull(source, "AttributionSource cannot be null in enableNoAutoConnect");

        requireNonNull(source, "AttributionSource cannot be null in disable");



        if (!persist) {

            mPermissionUtils.enforcePrivileged(mContext);