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

Commit d7cd0e2b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add debug log for set/remove active device." am: cbb4cd1f am:... 

Merge "Add debug log for set/remove active device." am: cbb4cd1f am: 1466c82f am: 24c414d9 am: a47b3f1a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1351257

Change-Id: Icc8a185deba5d0ef0a797fbcd241e2a002535a74
parents 042623ba a47b3f1a

core/java/android/bluetooth/BluetoothAdapter.java

+4 −0
Original line number Diff line number Diff line
@@ -1812,6 +1812,7 @@ public final class BluetoothAdapter { 
        try {

            mServiceLock.readLock().lock();

            if (mService != null) {

                if (DBG) Log.d(TAG, "removeActiveDevice, profiles: " + profiles);

                return mService.removeActiveDevice(profiles);

            }

        } catch (RemoteException e) {
@@ -1856,6 +1857,9 @@ public final class BluetoothAdapter { 
        try {

            mServiceLock.readLock().lock();

            if (mService != null) {

                if (DBG) {

                    Log.d(TAG, "setActiveDevice, device: " + device + ", profiles: " + profiles);

                }

                return mService.setActiveDevice(device, profiles);

            }

        } catch (RemoteException e) {