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

Commit 634519a4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8756523 from df31f054 to tm-d1-release 

Change-Id: I6ff0c167eadb81ad3f186359ce328f6bd32b3de3
parents cb7b9d1a df31f054

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/jni/com_android_bluetooth_vc.cpp

+2 −2
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static void setVolumeNative(JNIEnv* env, jobject object, jbyteArray address, 
  env->ReleaseByteArrayElements(address, addr, 0);

}



static void setVolumeGroupNative(JNIEnv* env, jobject object, jint group_id,

static void setGroupVolumeNative(JNIEnv* env, jobject object, jint group_id,

                                 jint volume) {

  if (!sVolumeControlInterface) {

    LOG(ERROR) << __func__
@@ -547,7 +547,7 @@ static JNINativeMethod sMethods[] = { 
    {"disconnectVolumeControlNative", "([B)Z",

     (void*)disconnectVolumeControlNative},

    {"setVolumeNative", "([BI)V", (void*)setVolumeNative},

    {"setVolumeGroupNative", "(II)V", (void*)setVolumeGroupNative},

    {"setGroupVolumeNative", "(II)V", (void*)setGroupVolumeNative},

    {"muteNative", "([B)V", (void*)muteNative},

    {"muteGroupNative", "(I)V", (void*)muteGroupNative},

    {"unmuteNative", "([B)V", (void*)unmuteNative},