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

Commit eb55cc18 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes I5917b91b,Ia6073398,I921a3a3b,I77888bd8,I7f6e8b9b into main 

* changes:
  SystemServer: Binder: Typo fixup
  SystemServer: Early return in the serviceConnection
  SystemServer: Deleting obsolete comment
  SystemServer: Access adapter with lock
  SystemServer: clean logging in ManagerService
parents 12403af4 1c5d7b5d

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);