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

Commit 0ab324f9 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge f0b8ca45 on remote branch 

Change-Id: I75752826dd9942c00fc7618666129787c437c3bc
parents e16650d7 f0b8ca45

jni/com_android_bluetooth_a2dp.cpp

+5 −2
Original line number Diff line number Diff line
@@ -208,6 +208,11 @@ static void initNative(JNIEnv *env, jobject object, jint maxA2dpConnections, 
         mCallbacksObj = NULL;

    }



    if ((mCallbacksObj = env->NewGlobalRef(object)) == NULL) {

        ALOGE("Failed to allocate Global Ref for A2DP Callbacks");

        return;

    }



    if ( (sBluetoothA2dpInterface = (btav_interface_t *)

          btInf->get_profile_interface(BT_PROFILE_ADVANCED_AUDIO_ID)) == NULL) {

        ALOGE("Failed to get Bluetooth A2DP Interface");
@@ -221,8 +226,6 @@ static void initNative(JNIEnv *env, jobject object, jint maxA2dpConnections, 
        sBluetoothA2dpInterface = NULL;

        return;

    }



    mCallbacksObj = env->NewGlobalRef(object);

}



static void cleanupNative(JNIEnv *env, jobject object) {

jni/com_android_bluetooth_btservice_AdapterService.cpp

+4 −1
Original line number Diff line number Diff line
@@ -754,6 +754,9 @@ static bool initNative(JNIEnv* env, jobject obj) { 
            sBluetoothInterface = NULL;

            return JNI_FALSE;

        }



        /*disable these os_callout settings, so that native wake_lock will be enabled*/

#if 0

        ret = sBluetoothInterface->set_os_callouts(&sBluetoothOsCallouts);

        if (ret != BT_STATUS_SUCCESS) {

            ALOGE("Error while setting Bluetooth callouts: %d\n", ret);
@@ -761,7 +764,7 @@ static bool initNative(JNIEnv* env, jobject obj) { 
            sBluetoothInterface = NULL;

            return JNI_FALSE;

        }



#endif

        if ( (sBluetoothSocketInterface = (btsock_interface_t *)

                  sBluetoothInterface->get_profile_interface(BT_PROFILE_SOCKETS_ID)) == NULL) {

                ALOGE("Error getting socket interface");

jni/com_android_bluetooth_hfp.cpp

+0 −1
Original line number Diff line number Diff line
@@ -726,7 +726,6 @@ static jboolean cindResponseNative(JNIEnv *env, jobject object, 
    return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;

}





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

                                                 jbyteArray address) {

    jbyte *addr;

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>