Snap for 10063449 from c830e5d2c193819deca5668f98dc1c06ab74ea6b to udc-qpr1-release (19e841be) · Commits · e / os / android_packages_modules_Bluetooth

android/app/res/values-kn/strings_sap.xml

+2 −2

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<resources xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<string name="bluetooth_sap_notif_title" msgid="7854456947435963346">"ಬ್ಲೂಟೂತ್ ಸಿಮ್ ಪ್ರವೇಶ"</string>
		<string name="bluetooth_sap_notif_ticker" msgid="7295825445933648498">"ಬ್ಲೂಟೂತ್ ಸಿಮ್ ಪ್ರವೇಶ"</string>
		<string name="bluetooth_sap_notif_title" msgid="7854456947435963346">"ಬ್ಲೂಟೂತ್ ಸಿಮ್ ಆ್ಯಕ್ಸೆಸ್"</string>
		<string name="bluetooth_sap_notif_ticker" msgid="7295825445933648498">"ಬ್ಲೂಟೂತ್ ಸಿಮ್ ಆ್ಯಕ್ಸೆಸ್"</string>
		<string name="bluetooth_sap_notif_message" msgid="1004269289836361678">"ಕಡಿತಗೊಳಿಸಲು ಕ್ಲೈಂಟ್ ಅನ್ನು ವಿನಂತಿಸುವುದೇ?"</string>
		<string name="bluetooth_sap_notif_disconnecting" msgid="6041257463440623400">"ಕಡಿತಗೊಳಿಸಲು ಕ್ಲೈಂಟ್‌ಗೆ ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ"</string>
		<string name="bluetooth_sap_notif_disconnect_button" msgid="3059012556387692616">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ"</string>

android/app/res/values-te/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@
		<string name="bt_sm_2_1_nosdcard" msgid="288667514869424273">"ఫైల్‌ను సేవ్ చేయడానికి USB స్టోరేజ్‌లో సరిపడేంత స్పేస్ లేదు."</string>
		<string name="bt_sm_2_1_default" msgid="5070195264206471656">"ఫైల్‌ను సేవ్ చేయడానికి SD కార్డ్‌లో సరిపడేంత స్పేస్ లేదు."</string>
		<string name="bt_sm_2_2" msgid="6200119660562110560">"కావలసిన స్థలం: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
		<string name="ErrorTooManyRequests" msgid="5049670841391761475">"చాలా ఎక్కువ రిక్వెస్ట్‌లు ప్రాసెస్ చేయబడుతున్నాయి. తర్వాత మళ్లీ ప్రయత్నించండి."</string>
		<string name="ErrorTooManyRequests" msgid="5049670841391761475">"చాలా ఎక్కువ రిక్వెస్ట్‌లు ప్రాసెస్ చేయబడుతున్నాయి. తర్వాత మళ్లీ ట్రై చేయండి."</string>
		<string name="status_pending" msgid="4781040740237733479">"ఫైల్ బదిలీ ఇంకా ప్రారంభించబడలేదు."</string>
		<string name="status_running" msgid="7419075903776657351">"ఫైల్ బదిలీ కొనసాగుతోంది."</string>
		<string name="status_success" msgid="7963589000098719541">"ఫైల్ బదిలీ విజయవంతంగా పూర్తయింది."</string>

android/app/src/com/android/bluetooth/util/DevicePolicyUtils.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.bluetooth.util;

		import android.annotation.SuppressLint;
		import android.app.admin.DevicePolicyManager;
		import android.content.Context;
		import android.net.Uri;
		@@ -48,8 +47,6 @@ public final class DevicePolicyUtils {
		* and the policy allows, it will be a URI that supports the managed profile.
		*/
		// TODO: Make primary profile can also support getBluetoothContactSharingDisabled()
		// TODO(b/193460475): Android Lint handles change from SystemApi to public incorrectly
		@SuppressLint("NewApi")
		public static Uri getEnterprisePhoneUri(Context context) {
		return isBluetoothWorkContactSharingDisabled(context) ? Phone.CONTENT_URI
		: Phone.ENTERPRISE_CONTENT_URI;

system/bta/av/bta_av_aact.cc

+2 −4

Original line number	Diff line number	Diff line
		@@ -1785,9 +1785,7 @@ void bta_av_getcap_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
		*
		******************************************************************************/
		void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
		uint8_t avdt_handle = p_data->ci_setconfig.avdt_handle;

		bta_av_adjust_seps_idx(p_scb, avdt_handle);
		bta_av_adjust_seps_idx(p_scb, p_scb->avdt_handle);
		LOG_INFO("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,
		p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl);
		AVDT_ConfigRsp(p_scb->avdt_handle, p_scb->avdt_label, AVDT_ERR_UNSUP_CFG, 0);
		@@ -1795,7 +1793,7 @@ void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
		tBTA_AV bta_av_data = {
		.reject =
		{
		.bd_addr = p_data->str_msg.bd_addr,
		.bd_addr = p_scb->PeerAddress(),
		.hndl = p_scb->hndl,
		},
		};

system/build/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -213,6 +213,7 @@ cc_defaults {
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"android.system.suspend-V1-ndk",
		"libPlatformProperties",
		"libaaudio",
		"libbinder_ndk",
		"libcutils",
		@@ -221,7 +222,6 @@ cc_defaults {
		"libtinyxml2",
		"libutils",
		"libz",
		"libPlatformProperties",
		],
		static_libs: [
		"android.system.suspend.control-V1-ndk",