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

Commit 548f7063 authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Automerger Merge Worker
Browse files

Merge "Do not check for battery service when seeing if any profiles are... 

Merge "Do not check for battery service when seeing if any profiles are enabled" am: aa29109a am: e7373487 am: e13e0dc4 am: 5f884ca2 am: c1ab0bf1

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



Change-Id: Id3aad875d1e6fd73be7e46527bbb50d4c4abf30b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd1e1cd9 c1ab0bf1

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

+0 −4
Original line number Diff line number Diff line
@@ -1434,10 +1434,6 @@ public class AdapterService extends Service { 
                 > BluetoothProfile.CONNECTION_POLICY_FORBIDDEN) {

            return true;

        }

        if (mBatteryService != null && mBatteryService.getConnectionPolicy(device)

                > BluetoothProfile.CONNECTION_POLICY_FORBIDDEN) {

            return true;

        }

        return false;

    }