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

Commit aebf80d8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002' into HEAD"

parents 71a813fe f0399274

jni/com_android_bluetooth_btservice_AdapterService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -973,7 +973,7 @@ static jboolean cancelBondNative(JNIEnv* env, jobject obj, jbyteArray address) { 
    return result;

}



static jboolean isConnectedNative(JNIEnv* env, jobject obj, jbyteArray address) {

static int getConnectionStateNative(JNIEnv* env, jobject obj, jbyteArray address) {

    ALOGV("%s:",__FUNCTION__);

    if (!sBluetoothInterface) return JNI_FALSE;
@@ -986,7 +986,7 @@ static jboolean isConnectedNative(JNIEnv* env, jobject obj, jbyteArray address) 
    int ret = sBluetoothInterface->get_connection_state((bt_bdaddr_t *)addr);

    env->ReleaseByteArrayElements(address, addr, 0);



    return (ret != 0 ? JNI_TRUE : JNI_FALSE);

    return ret;

}



static jboolean pinReplyNative(JNIEnv *env, jobject obj, jbyteArray address, jboolean accept,
@@ -1366,7 +1366,7 @@ static JNINativeMethod sMethods[] = { 
    {"createBondNative", "([BI)Z", (void*) createBondNative},

    {"removeBondNative", "([B)Z", (void*) removeBondNative},

    {"cancelBondNative", "([B)Z", (void*) cancelBondNative},

    {"isConnectedNative", "([B)Z", (void*) isConnectedNative},

    {"getConnectionStateNative", "([B)I", (void*) getConnectionStateNative},

    {"pinReplyNative", "([BZI[B)Z", (void*) pinReplyNative},

    {"sspReplyNative", "([BIZI)Z", (void*) sspReplyNative},

    {"getRemoteServicesNative", "([B)Z", (void*) getRemoteServicesNative},

jni/com_android_bluetooth_gatt.cpp

+13 −3
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ static jmethodID method_onAttributeWrite; 
static jmethodID method_onExecuteWrite;

static jmethodID method_onNotificationSent;

static jmethodID method_onServerCongestion;

static jmethodID method_onServerMtuChanged;



/**

 * Static variables
@@ -774,6 +775,13 @@ void btgatts_congestion_cb(int conn_id, bool congested) 
    checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);

}



void btgatts_mtu_changed_cb(int conn_id, int mtu)

{

    CHECK_CALLBACK_ENV

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onServerMtuChanged, conn_id, mtu);

    checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);

}



static const btgatt_server_callbacks_t sGattServerCallbacks = {

    btgatts_register_app_cb,

    btgatts_connection_cb,
@@ -789,7 +797,8 @@ static const btgatt_server_callbacks_t sGattServerCallbacks = { 
    btgatts_request_exec_write_cb,

    btgatts_response_confirmation_cb,

    btgatts_indication_sent_cb,

    btgatts_congestion_cb

    btgatts_congestion_cb,

    btgatts_mtu_changed_cb

};



/**
@@ -859,6 +868,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) { 
    method_onExecuteWrite= env->GetMethodID(clazz, "onExecuteWrite", "(Ljava/lang/String;III)V");

    method_onNotificationSent = env->GetMethodID(clazz, "onNotificationSent", "(II)V");

    method_onServerCongestion = env->GetMethodID(clazz, "onServerCongestion", "(IZ)V");

    method_onServerMtuChanged = env->GetMethodID(clazz, "onMtuChanged", "(II)V");



    info("classInitNative: Success!");

}
@@ -1715,6 +1725,8 @@ static JNINativeMethod sAdvertiseMethods[] = { 
    {"gattClientUpdateAdvNative", "(IIIIIII)V", (void *) gattClientUpdateAdvNative},

    {"gattClientSetAdvDataNative", "(IZZZI[B[B[B)V", (void *) gattClientSetAdvDataNative},

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

    {"gattSetAdvDataNative", "(IZZZIII[B[B[B)V", (void *) gattSetAdvDataNative},

    {"gattAdvertiseNative", "(IZ)V", (void *) gattAdvertiseNative},

};



// JNI functions defined in ScanManager class.
@@ -1758,7 +1770,6 @@ static JNINativeMethod sMethods[] = { 
    {"gattClientExecuteWriteNative", "(IZ)V", (void *) gattClientExecuteWriteNative},

    {"gattClientRegisterForNotificationsNative", "(ILjava/lang/String;IIJJIJJZ)V", (void *) gattClientRegisterForNotificationsNative},

    {"gattClientReadRemoteRssiNative", "(ILjava/lang/String;)V", (void *) gattClientReadRemoteRssiNative},

    {"gattAdvertiseNative", "(IZ)V", (void *) gattAdvertiseNative},

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

    {"gattConnectionParameterUpdateNative", "(ILjava/lang/String;IIII)V", (void *) gattConnectionParameterUpdateNative},

    {"gattServerRegisterAppNative", "(JJ)V", (void *) gattServerRegisterAppNative},
@@ -1776,7 +1787,6 @@ static JNINativeMethod sMethods[] = { 
    {"gattServerSendNotificationNative", "(III[B)V", (void *) gattServerSendNotificationNative},

    {"gattServerSendResponseNative", "(IIIIII[BI)V", (void *) gattServerSendResponseNative},



    {"gattSetAdvDataNative", "(IZZZIII[B[B[B)V", (void *) gattSetAdvDataNative},

    {"gattTestNative", "(IJJLjava/lang/String;IIIII)V", (void *) gattTestNative},

};

res/values-bn-rBD/strings.xml

+1 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
    <string name="bt_enable_cancel" msgid="1988832367505151727">"বাতিল করুন"</string>

    <string name="bt_enable_ok" msgid="3432462749994538265">"চালু করুন"</string>

    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"ফাইল স্থানান্তর"</string>

    <string name="incoming_file_confirm_content" msgid="2752605552743148036">"আগত ফাইল স্বীকার করবেন?"</string>

    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" আপনাকে <xliff:g id="FILE">%2$s</xliff:g>(<xliff:g id="SIZE">%3$s</xliff:g>) পাঠাতে চাইছে। \n\n ফাইলটি গ্রহণ করবেন?"</string>

    <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"অস্বীকার করুন"</string>

    <string name="incoming_file_confirm_ok" msgid="281462442932231475">"স্বীকার করুন"</string>

    <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"ঠিক আছে"</string>
@@ -54,9 +54,6 @@ 
    <string name="download_line5" msgid="3069560415845295386">"ফাইল প্রাপ্ত হচ্ছে…"</string>

    <string name="download_cancel" msgid="9177305996747500768">"থামান"</string>

    <string name="download_ok" msgid="5000360731674466039">"লুকান"</string>

    <string name="incoming_line1" msgid="2127419875681087545">"প্রেরক"</string>

    <string name="incoming_line2" msgid="3348994249285315873">"ফাইলের নাম"</string>

    <string name="incoming_line3" msgid="7954237069667474024">"আকার"</string>

    <string name="download_fail_line1" msgid="3846450148862894552">"ফাইল প্রাপ্ত করা যায়নি"</string>

    <string name="download_fail_line2" msgid="8950394574689971071">"ফাইল: <xliff:g id="FILE">%1$s</xliff:g>"</string>

    <string name="download_fail_line3" msgid="3451040656154861722">"কারণ: <xliff:g id="REASON">%1$s</xliff:g>"</string>

res/values-eu-rES/strings.xml

+2 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Bluetooth bidezko partekatzeen kudeatzailea atzitzea eta fitxategiak transferitzeko erabiltzea baimentzen die aplikazioei."</string>

    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Sartu sarbidedunen zerrendan Bluetooth gailua."</string>

    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Bluetooth gailu bat aldi baterako sarbidedunen zerrendan sartzea baimentzen die aplikazioei, gailu honetara fitxategiak bidaltzeko baimena izan dezan, baina gailu honen erabiltzaileari berrespena eskatu beharrik gabe."</string>

    <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>

    <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetootha"</string>

    <string name="unknown_device" msgid="9221903979877041009">"Gailu ezezaguna"</string>

    <string name="unknownNumber" msgid="4994750948072751566">"Ezezaguna"</string>

    <string name="airplane_error_title" msgid="2683839635115739939">"Hegaldi modua"</string>
@@ -31,7 +31,7 @@ 
    <string name="bt_enable_cancel" msgid="1988832367505151727">"Utzi"</string>

    <string name="bt_enable_ok" msgid="3432462749994538265">"Aktibatu"</string>

    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Fitxategi-transferentzia"</string>

    <string name="incoming_file_confirm_content" msgid="2752605552743148036">"Sarrerako fitxategia onartu nahi duzu?"</string>

    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" igorleak <xliff:g id="FILE">%2$s</xliff:g> fitxategia bidali nahi dizu (<xliff:g id="SIZE">%3$s</xliff:g>).\n\nFitxategia onartu nahi duzu?"</string>

    <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Baztertu"</string>

    <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Onartu"</string>

    <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"Ados"</string>
@@ -54,9 +54,6 @@ 
    <string name="download_line5" msgid="3069560415845295386">"Fitxategia jasotzen…"</string>

    <string name="download_cancel" msgid="9177305996747500768">"Gelditu"</string>

    <string name="download_ok" msgid="5000360731674466039">"Ezkutatu"</string>

    <string name="incoming_line1" msgid="2127419875681087545">"Igorlea"</string>

    <string name="incoming_line2" msgid="3348994249285315873">"Fitxategi-izena"</string>

    <string name="incoming_line3" msgid="7954237069667474024">"Tamaina"</string>

    <string name="download_fail_line1" msgid="3846450148862894552">"Ez da fitxategia jaso"</string>

    <string name="download_fail_line2" msgid="8950394574689971071">"Fitxategia: <xliff:g id="FILE">%1$s</xliff:g>"</string>

    <string name="download_fail_line3" msgid="3451040656154861722">"Arrazoia: <xliff:g id="REASON">%1$s</xliff:g>"</string>

res/values-gl-rES/strings.xml

+1 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
    <string name="bt_enable_cancel" msgid="1988832367505151727">"Cancelar"</string>

    <string name="bt_enable_ok" msgid="3432462749994538265">"Activar"</string>

    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transferencia de ficheiros"</string>

    <string name="incoming_file_confirm_content" msgid="2752605552743148036">"Queres aceptar o ficheiro entrante?"</string>

    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" quere enviarche <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>). \n\n Queres aceptar o ficheiro?"</string>

    <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Rexeitar"</string>

    <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Aceptar"</string>

    <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"Aceptar"</string>
@@ -54,9 +54,6 @@ 
    <string name="download_line5" msgid="3069560415845295386">"Recibindo ficheiro..."</string>

    <string name="download_cancel" msgid="9177305996747500768">"Deter"</string>

    <string name="download_ok" msgid="5000360731674466039">"Ocultar"</string>

    <string name="incoming_line1" msgid="2127419875681087545">"De"</string>

    <string name="incoming_line2" msgid="3348994249285315873">"Nome do ficheiro"</string>

    <string name="incoming_line3" msgid="7954237069667474024">"Tamaño"</string>

    <string name="download_fail_line1" msgid="3846450148862894552">"Ficheiro non recibido"</string>

    <string name="download_fail_line2" msgid="8950394574689971071">"Ficheiro: <xliff:g id="FILE">%1$s</xliff:g>"</string>

    <string name="download_fail_line3" msgid="3451040656154861722">"Motivo: <xliff:g id="REASON">%1$s</xliff:g>"</string>