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

Commit d8e94457 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-7.1.0_r4' of... 

Merge tag 'android-7.1.0_r4' of https://android.googlesource.com/platform/packages/apps/Bluetooth into 71

Android 7.1.0 release 4

Change-Id: I44595dac56b16a9b3c24a9d0c3afdc69abae5f92
parents a0581a42 00f33075

jni/com_android_bluetooth_hfp.cpp

+59 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ static jmethodID method_onAtCops; 
static jmethodID method_onAtClcc;

static jmethodID method_onUnknownAt;

static jmethodID method_onKeyPressed;

static jmethodID method_onAtBind;

static jmethodID method_onAtBiev;



static const bthf_interface_t *sBluetoothHfpInterface = NULL;

static jobject mCallbacksObj = NULL;
@@ -377,6 +379,34 @@ static void key_pressed_callback(bt_bdaddr_t* bd_addr) { 
    sCallbackEnv->DeleteLocalRef(addr);

}



static void at_bind_callback(char *at_string, bt_bdaddr_t *bd_addr) {

    CHECK_CALLBACK_ENV



    jbyteArray addr = marshall_bda(bd_addr);

    if (addr == NULL)

        return;



    jstring js_at_string = sCallbackEnv->NewStringUTF(at_string);



    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onAtBind, js_at_string, addr);

    checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);



    sCallbackEnv->DeleteLocalRef(js_at_string);

    sCallbackEnv->DeleteLocalRef(addr);

}



static void at_biev_callback(bthf_hf_ind_type_t ind_id, int ind_value, bt_bdaddr_t *bd_addr) {

    CHECK_CALLBACK_ENV



    jbyteArray addr = marshall_bda(bd_addr);

    if (addr == NULL)

        return;



    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onAtBiev, ind_id, (jint)ind_value, addr);

    checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);

    sCallbackEnv->DeleteLocalRef(addr);

}



static bthf_callbacks_t sBluetoothHfpCallbacks = {

    sizeof(sBluetoothHfpCallbacks),

    connection_state_callback,
@@ -395,6 +425,8 @@ static bthf_callbacks_t sBluetoothHfpCallbacks = { 
    at_cops_callback,

    at_clcc_callback,

    unknown_at_callback,

    at_bind_callback,

    at_biev_callback,

    key_pressed_callback

};
@@ -417,6 +449,8 @@ static void classInitNative(JNIEnv* env, jclass clazz) { 
    method_onAtClcc = env->GetMethodID(clazz, "onAtClcc", "([B)V");

    method_onUnknownAt = env->GetMethodID(clazz, "onUnknownAt", "(Ljava/lang/String;[B)V");

    method_onKeyPressed = env->GetMethodID(clazz, "onKeyPressed", "([B)V");

    method_onAtBind = env->GetMethodID(clazz, "onATBind", "(Ljava/lang/String;[B)V");

    method_onAtBiev = env->GetMethodID(clazz, "onATBiev", "(II[B)V");



    ALOGI("%s: succeeds", __FUNCTION__);

}
@@ -678,6 +712,30 @@ static jboolean cindResponseNative(JNIEnv *env, jobject object, 
    return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;

}



static jboolean bindResponseNative(JNIEnv *env,jobject object,

                                jint ind_id, jboolean ind_status,

                                jbyteArray address) {

    ALOGI("%s: sBluetoothHfpInterface: %p", __FUNCTION__, sBluetoothHfpInterface);



    if (!sBluetoothHfpInterface)

        return JNI_FALSE;



    jbyte *addr = env->GetByteArrayElements(address, NULL);

    if (!addr) {

        jniThrowIOException(env, EINVAL);

        return JNI_FALSE;

    }



    bt_status_t status = sBluetoothHfpInterface->bind_response((bthf_hf_ind_type_t) ind_id,

                   ind_status ? BTHF_HF_IND_ENABLED : BTHF_HF_IND_DISABLED,

                   (bt_bdaddr_t *)addr);



    if (status != BT_STATUS_SUCCESS)

        ALOGE("%s: Failed bind_response, status: %d", __FUNCTION__, status);



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

    return (status == BT_STATUS_SUCCESS ? JNI_TRUE : JNI_FALSE);

}



static jboolean atResponseStringNative(JNIEnv *env, jobject object, jstring response_str,

                                                 jbyteArray address) {
@@ -820,6 +878,7 @@ static JNINativeMethod sMethods[] = { 
    {"notifyDeviceStatusNative", "(IIII)Z", (void *) notifyDeviceStatusNative},

    {"copsResponseNative", "(Ljava/lang/String;[B)Z", (void *) copsResponseNative},

    {"cindResponseNative", "(IIIIIII[B)Z", (void *) cindResponseNative},

    {"bindResponseNative", "(IZ[B)Z", (void *)bindResponseNative},

    {"atResponseStringNative", "(Ljava/lang/String;[B)Z", (void *) atResponseStringNative},

    {"atResponseCodeNative", "(II[B)Z", (void *)atResponseCodeNative},

    {"clccResponseNative", "(IIIIZLjava/lang/String;I[B)Z", (void *) clccResponseNative},

res/values-ca/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    <string name="airplane_error_msg" msgid="8698965595254137230">"No pots utilitzar Bluetooth en mode d\'avió."</string>

    <string name="bt_enable_title" msgid="8657832550503456572"></string>

    <string name="bt_enable_line1" msgid="7203551583048149">"Per utilitzar serveis Bluetooth, primer cal que activeu el Bluetooth."</string>

    <string name="bt_enable_line2" msgid="4341936569415937994">"Voleu activar el Bluetooth ara?"</string>

    <string name="bt_enable_line2" msgid="4341936569415937994">"Vols activar el Bluetooth ara?"</string>

    <string name="bt_enable_cancel" msgid="1988832367505151727">"Cancel·la"</string>

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

    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transferència del fitxer"</string>

res/values-fa/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
    <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"‏هیچ کارت SD موجود نیست. برای ذخیره فایل‌های منتقل شده، یک کارت SD در گوشی قرار دهید."</string>

    <string name="status_connection_error" msgid="947681831523219891">"اتصال ناموفق بود."</string>

    <string name="status_protocol_error" msgid="3245444473429269539">"درخواست به درستی انجام نمی‌شود."</string>

    <string name="status_unknown_error" msgid="8156660554237824912">"خطای ناشناخته."</string>

    <string name="status_unknown_error" msgid="8156660554237824912">"خطای ناشناس."</string>

    <string name="btopp_live_folder" msgid="7967791481444474554">"بلوتوث دریافت شد"</string>

    <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> دریافت کامل شد."</string>

    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> ارسال کامل شد."</string>

res/values-fa/strings_pbap.xml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
    <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"به کلید جلسه بلوتوث نیاز است"</string>

    <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"‏هنگام پذیرش اتصال به %1$s وقفه زمانی ایجاد شده است"</string>

    <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"‏هنگام ورود کلید جلسه با %1$s وقفه زمانی ایجاد شده است"</string>

    <string name="auth_notif_ticker" msgid="1575825798053163744">"‏درخواست راستی‌آزمایی Obex"</string>

    <string name="auth_notif_ticker" msgid="1575825798053163744">"‏درخواست احراز هویت Obex"</string>

    <string name="auth_notif_title" msgid="7599854855681573258">"کلید جلسه"</string>

    <string name="auth_notif_message" msgid="6667218116427605038">"‏تایپ کلید جلسه برای %1$s"</string>

    <string name="defaultname" msgid="4821590500649090078">"کیت خودرو"</string>

res/values-hy-rAM/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
    <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>

    <string name="unknown_device" msgid="9221903979877041009">"Անհայտ սարք"</string>

    <string name="unknownNumber" msgid="4994750948072751566">"Անհայտ"</string>

    <string name="airplane_error_title" msgid="2683839635115739939">"Ինքնաթիռային ռեժիմ"</string>

    <string name="airplane_error_msg" msgid="8698965595254137230">"Դուք չեք կարող օգտվել Bluetooth-ից ինքնաթիռային ռեժիմում:"</string>

    <string name="airplane_error_title" msgid="2683839635115739939">"Ինքնաթիռի ռեժիմ"</string>

    <string name="airplane_error_msg" msgid="8698965595254137230">"Դուք չեք կարող օգտվել Bluetooth-ից Ինքնաթիռի ռեժիմում:"</string>

    <string name="bt_enable_title" msgid="8657832550503456572"></string>

    <string name="bt_enable_line1" msgid="7203551583048149">"Bluetooth ծառայություններից օգտվելու համար նախ պետք է միացնեք Bluetooth-ը:"</string>

    <string name="bt_enable_line2" msgid="4341936569415937994">"Միացնե՞լ Bluetooth-ը հիմա:"</string>