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

Commit c2e81282 authored Mar 07, 2020 by Luca Stefani

Merge tag 'android-10.0.0_r31' into lineage-17.1-android-10.0.0_r31

Android 10.0.0 release 31

* tag 'android-10.0.0_r31':
  Import translations. DO NOT MERGE
  Update playback state only for navigation sound
  Monitor AudioManger Playback state to update the AVRCP playback state
  A2dp: Check the value of mConnectionState in isConnected
  DO NOT MERGE: Make NIAP a Global Setting toggle.
  Send call state to native when silence mode is on
  Enforce BLUETOOTH_PRIVILEGED in setPhonebookAccessPermission
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  BLE: GattService debug infomation implementation
  BLE: Rename existing variables in AppScanStats
  Import translations. DO NOT MERGE
  BLE: Don't start scan if the same Pi scan is running.
  Ignore incoming A2DP if profile is disabled
  NullPointerException handling, connectObexSession
  Apply the new A2DP codec config only when passed the check with codec status

Change-Id: I08e99783549eea3a79fef3d67703896ab9986491

parents 6f6a05cb a87a938d

jni/com_android_bluetooth_btservice_AdapterService.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -684,7 +684,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) {
	}		}

	static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest,		static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest,
	jboolean isSingleUserMode) {		jboolean isNiapMode) {
	ALOGV("%s", __func__);		ALOGV("%s", __func__);

	android_bluetooth_UidTraffic.clazz =		android_bluetooth_UidTraffic.clazz =
	@@ -700,7 +700,7 @@ static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest,

	int ret = sBluetoothInterface->init(&sBluetoothCallbacks,		int ret = sBluetoothInterface->init(&sBluetoothCallbacks,
	isGuest == JNI_TRUE ? 1 : 0,		isGuest == JNI_TRUE ? 1 : 0,
	isSingleUserMode == JNI_TRUE ? 1 : 0);		isNiapMode == JNI_TRUE ? 1 : 0);
	if (ret != BT_STATUS_SUCCESS) {		if (ret != BT_STATUS_SUCCESS) {
	ALOGE("Error while setting the callbacks: %d\n", ret);		ALOGE("Error while setting the callbacks: %d\n", ret);
	sBluetoothInterface = NULL;		sBluetoothInterface = NULL;

res/values-ca/strings.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,7 @@
	xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">		xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
	<string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Accediu al gestor de baixades."</string>		<string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Accediu al gestor de baixades."</string>
	<string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Permet que l\'aplicació accedeixi al gestor d\'ús compartit de Bluetooth i que l\'utilitzi per transferir fitxers."</string>		<string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Permet que l\'aplicació accedeixi al gestor d\'ús compartit de Bluetooth i que l\'utilitzi per transferir fitxers."</string>
	<string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Accés al dispositiu Bluetooth en llista blanca."</string>		<string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Accés de dispositius Bluetooth en llista blanca."</string>
	<string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Permet que l\'aplicació col·loqui temporalment en una llista blanca un dispositiu Bluetooth, cosa que permet que el dispositiu enviï fitxers a aquest dispositiu sense la confirmació de l\'usuari."</string>		<string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Permet que l\'aplicació col·loqui temporalment en una llista blanca un dispositiu Bluetooth, cosa que permet que el dispositiu enviï fitxers a aquest dispositiu sense la confirmació de l\'usuari."</string>
	<string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>		<string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
	<string name="unknown_device" msgid="9221903979877041009">"Dispositiu desconegut"</string>		<string name="unknown_device" msgid="9221903979877041009">"Dispositiu desconegut"</string>
	@@ -30,7 +30,7 @@
	<string name="bt_enable_line2" msgid="4341936569415937994">"Vols 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_cancel" msgid="1988832367505151727">"Cancel·la"</string>
	<string name="bt_enable_ok" msgid="3432462749994538265">"Activa"</string>		<string name="bt_enable_ok" msgid="3432462749994538265">"Activa"</string>
	<string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transferència del fitxer"</string>		<string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transferència de fitxers"</string>
	<string name="incoming_file_confirm_content" msgid="2752605552743148036">"Acceptes el fitxer entrant?"</string>		<string name="incoming_file_confirm_content" msgid="2752605552743148036">"Acceptes el fitxer entrant?"</string>
	<string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Rebutja"</string>		<string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Rebutja"</string>
	<string name="incoming_file_confirm_ok" msgid="281462442932231475">"Accepta"</string>		<string name="incoming_file_confirm_ok" msgid="281462442932231475">"Accepta"</string>

res/values-hi/test_strings.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,7 @@
	xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">		xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
	<string name="app_name" msgid="6006644116867509664">"ब्लूटूथ"</string>		<string name="app_name" msgid="6006644116867509664">"ब्लूटूथ"</string>
	<string name="insert_record" msgid="1450997173838378132">"रिकॉर्ड सम्मिलित करें"</string>		<string name="insert_record" msgid="1450997173838378132">"रिकॉर्ड सम्मिलित करें"</string>
	<string name="update_record" msgid="2480425402384910635">"रिकॉर्ड की दुबारा पूछें"</string>		<string name="update_record" msgid="2480425402384910635">"रिकॉर्ड की पुष्टि करें"</string>
	<string name="ack_record" msgid="6716152390978472184">"रिकॉर्ड अभिस्वीकृत करें"</string>		<string name="ack_record" msgid="6716152390978472184">"रिकॉर्ड अभिस्वीकृत करें"</string>
	<string name="deleteAll_record" msgid="4383349788485210582">"सभी रिकॉर्ड मिटाएं"</string>		<string name="deleteAll_record" msgid="4383349788485210582">"सभी रिकॉर्ड मिटाएं"</string>
	<string name="ok_button" msgid="6519033415223065454">"ठीक है"</string>		<string name="ok_button" msgid="6519033415223065454">"ठीक है"</string>

res/values-iw/strings.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -69,7 +69,7 @@
	<string name="upload_succ_ok" msgid="7705428476405478828">"אישור"</string>		<string name="upload_succ_ok" msgid="7705428476405478828">"אישור"</string>
	<string name="upload_fail_line1" msgid="7899394672421491701">"הקובץ לא נשלח אל <xliff:g id="RECIPIENT">%1$s</xliff:g>."</string>		<string name="upload_fail_line1" msgid="7899394672421491701">"הקובץ לא נשלח אל <xliff:g id="RECIPIENT">%1$s</xliff:g>."</string>
	<string name="upload_fail_line1_2" msgid="2108129204050841798">"קובץ: <xliff:g id="FILE">%1$s</xliff:g>"</string>		<string name="upload_fail_line1_2" msgid="2108129204050841798">"קובץ: <xliff:g id="FILE">%1$s</xliff:g>"</string>
	<string name="upload_fail_ok" msgid="5807702461606714296">"נסה שוב"</string>		<string name="upload_fail_ok" msgid="5807702461606714296">"כדאי לנסות שוב"</string>
	<string name="upload_fail_cancel" msgid="9118496285835687125">"סגור"</string>		<string name="upload_fail_cancel" msgid="9118496285835687125">"סגור"</string>
	<string name="bt_error_btn_ok" msgid="5965151173011534240">"אישור"</string>		<string name="bt_error_btn_ok" msgid="5965151173011534240">"אישור"</string>
	<string name="unknown_file" msgid="6092727753965095366">"קובץ לא ידוע"</string>		<string name="unknown_file" msgid="6092727753965095366">"קובץ לא ידוע"</string>

res/values-mr/strings.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -127,7 +127,7 @@
	<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"रद्द करा"</string>		<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"रद्द करा"</string>
	<string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"तुम्ही ब्लूटूथद्वारे शेअर करू इच्छित असलेली खाती निवडा. कनेक्ट करताना अद्याप तुम्ही खात्यांमधील कोणताही अ‍ॅक्सेस स्वीकारण्याची आवश्यकता आहे."</string>		<string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"तुम्ही ब्लूटूथद्वारे शेअर करू इच्छित असलेली खाती निवडा. कनेक्ट करताना अद्याप तुम्ही खात्यांमधील कोणताही अ‍ॅक्सेस स्वीकारण्याची आवश्यकता आहे."</string>
	<string name="bluetooth_map_settings_count" msgid="4557473074937024833">"स्लॉट शिल्लक:"</string>		<string name="bluetooth_map_settings_count" msgid="4557473074937024833">"स्लॉट शिल्लक:"</string>
	<string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"अॅप्लिकेशन आयकन"</string>		<string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"ॲप्लिकेशन आयकन"</string>
	<string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ब्लूटूथ मेसेज सामायिकरण सेटिंग्ज"</string>		<string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ब्लूटूथ मेसेज सामायिकरण सेटिंग्ज"</string>
	<string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"खाते निवडू शकत नाही. 0 स्लॉट शिल्लक"</string>		<string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"खाते निवडू शकत नाही. 0 स्लॉट शिल्लक"</string>
	<string name="bluetooth_connected" msgid="6718623220072656906">"ब्लूटूथ ऑडिओ कनेक्ट केला"</string>		<string name="bluetooth_connected" msgid="6718623220072656906">"ब्लूटूथ ऑडिओ कनेक्ट केला"</string>