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

Commit 619aba9c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8756258 from 288cc620 to tm-release 

Change-Id: I6cf57278242942ac3b6073a4fd6bdaf39a89dc5c
parents 314ed0f4 288cc620

android/app/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ android_app { 
        ":bluetooth-proto-enums-java-gen",

    ],

    aaptflags: [ "--custom-package", "com.android.bluetooth" ],

    certificate: ":com.android.bluetooth.services.certificate",

    certificate: ":com.android.bluetooth.certificate",



    jarjar_rules: ":bluetooth-jarjar-rules",
@@ -202,6 +202,6 @@ genrule { 
}



android_app_certificate {

    name: "com.android.bluetooth.services.certificate",

    certificate: "certs/com.android.bluetooth.services"

    name: "com.android.bluetooth.certificate",

    certificate: "certs/com.android.bluetooth"

}

android/app/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

  package="com.android.bluetooth.services"

  package="com.android.bluetooth"

  android:sharedUserId="android.uid.bluetooth">



    <!-- Allows access to the Bluetooth Share Manager -->

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

+5 −2
Original line number Diff line number Diff line
@@ -416,8 +416,11 @@ public class BatteryService extends ProfileService { 
        return mAdapterService.getDatabase()

                .getProfileConnectionPolicy(device, BluetoothProfile.BATTERY);

    }



    void handleBatteryChanged(BluetoothDevice device, int batteryLevel) {

    /**

     * Called when the battery level of the device is notified.

     */

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    public void handleBatteryChanged(BluetoothDevice device, int batteryLevel) {

        mAdapterService.setBatteryLevel(device, batteryLevel);

    }