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

Commit 2ee003a3 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "bas: add Battery service profile support" am: 8e0ad516 am: 242e9db1 

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

Change-Id: If01b17f237ad9d7786d2854de096eaed9b214e64
parents 912a1e4f 242e9db1

android/app/AndroidManifest.xml

+9 −0
Original line number Diff line number Diff line
@@ -497,5 +497,14 @@ 
              <action android:name="android.telecom.InCallService"/>

            </intent-filter>

         </service>

        <service

            android:process="@string/process"

            android:name=".bas.BatteryService"

            android:enabled="@bool/profile_supported_battery"

            android:exported = "true">

            <intent-filter>

                <action android:name="android.bluetooth.IBluetoothBattery" />

            </intent-filter>

        </service>

    </application>

</manifest>

android/app/res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
    <bool name="profile_supported_le_call_control">true</bool>

    <bool name="profile_supported_hap_client">true</bool>

    <bool name="profile_supported_bass_client">false</bool>

    <bool name="profile_supported_battery">true</bool>



    <!-- If true, we will require location to be enabled on the device to

         fire Bluetooth LE scan result callbacks in addition to having one

android/app/src/com/android/bluetooth/bas/BatteryService.java

0 → 100644
+652 −0

File added.

Preview size limit exceeded, changes collapsed.

android/app/src/com/android/bluetooth/bas/BatteryStateMachine.java

0 → 100644
+581 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+30 −8

File changed.

Preview size limit exceeded, changes collapsed.