Snap for 8567972 from 0ed8c4b2e1b7f0aae7866394b3c0e0caa0de877f to tm-qpr1-release (7a5ea528) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/btservice/Config.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ public class Config {
		new ProfileConfig(AvrcpControllerService.class, AvrcpControllerService.isEnabled(),
		(1 << BluetoothProfile.AVRCP_CONTROLLER)),
		new ProfileConfig(BassClientService.class, BassClientService.isEnabled(),
		(1 >> BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT)),
		(1 << BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT)),
		new ProfileConfig(BatteryService.class, BatteryService.isEnabled(),
		(1 << BluetoothProfile.BATTERY)),
		new ProfileConfig(CsipSetCoordinatorService.class,

android/app/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java

+19 −8

Original line number	Diff line number	Diff line
		@@ -101,6 +101,17 @@ public class BluetoothPbapObexServer extends ServerRequestHandler {
		"/telecom/och",
		"/telecom/mch",
		"/telecom/cch",
		};

		// Currently not support SIM card
		@SuppressWarnings("unused") private static final String[] LEGAL_PATH_WITH_SIM = {
		"/telecom",
		"/telecom/pb",
		"/telecom/fav",
		"/telecom/ich",
		"/telecom/och",
		"/telecom/mch",
		"/telecom/cch",
		"/SIM1",
		"/SIM1/telecom",
		"/SIM1/telecom/ich",
		@@ -108,7 +119,6 @@ public class BluetoothPbapObexServer extends ServerRequestHandler {
		"/SIM1/telecom/mch",
		"/SIM1/telecom/cch",
		"/SIM1/telecom/pb"

		};

		// SIM card
		@@ -463,23 +473,21 @@ public class BluetoothPbapObexServer extends ServerRequestHandler {
		appParamValue.needTag = ContentType.PHONEBOOK;
		} else if (mCurrentPath.equals(FAV_PATH)) {
		appParamValue.needTag = ContentType.FAVORITES;
		} else if (mCurrentPath.equals(ICH_PATH) \|\| mCurrentPath.equals(SIM_ICH_PATH)) {
		} else if (mCurrentPath.equals(ICH_PATH)) {
		appParamValue.needTag = ContentType.INCOMING_CALL_HISTORY;
		} else if (mCurrentPath.equals(OCH_PATH)\|\| mCurrentPath.equals(SIM_OCH_PATH)) {
		} else if (mCurrentPath.equals(OCH_PATH)) {
		appParamValue.needTag = ContentType.OUTGOING_CALL_HISTORY;
		} else if (mCurrentPath.equals(MCH_PATH)\|\| mCurrentPath.equals(SIM_MCH_PATH)) {
		} else if (mCurrentPath.equals(MCH_PATH)) {
		appParamValue.needTag = ContentType.MISSED_CALL_HISTORY;
		mNeedNewMissedCallsNum = true;
		} else if (mCurrentPath.equals(CCH_PATH)\|\| mCurrentPath.equals(SIM_CCH_PATH)) {
		} else if (mCurrentPath.equals(CCH_PATH)) {
		appParamValue.needTag = ContentType.COMBINED_CALL_HISTORY;
		} else if (mCurrentPath.equals(TELECOM_PATH)\|\| mCurrentPath.equals(SIM_PATH)) {
		} else if (mCurrentPath.equals(TELECOM_PATH)) {
		/* PBAP 1.1.1 change */
		if (!validName && type.equals(TYPE_LISTING)) {
		Log.e(TAG, "invalid vcard listing request in default folder");
		return ResponseCodes.OBEX_HTTP_NOT_FOUND;
		}
		} else if (mCurrentPath.equals(SIM_PB_PATH)) {
		appParamValue.needTag = ContentType.SIM_PHONEBOOK;
		} else {
		Log.w(TAG, "mCurrentpath is not valid path!!!");
		return ResponseCodes.OBEX_HTTP_NOT_ACCEPTABLE;
		@@ -495,6 +503,9 @@ public class BluetoothPbapObexServer extends ServerRequestHandler {
		TYPE_PB, TYPE_LISTING, mCurrentPath)) {
		appParamValue.needTag = ContentType.SIM_PHONEBOOK;
		if (D) Log.d(TAG, "download SIM phonebook request");
		// Not support SIM card currently
		Log.w(TAG, "Not support access SIM card info!");
		return ResponseCodes.OBEX_HTTP_NOT_ACCEPTABLE;
		} else if (isNameMatchTarget(name, PB)) {
		appParamValue.needTag = ContentType.PHONEBOOK;
		if (D) {

android/app/src/com/android/bluetooth/pbap/BluetoothPbapService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect

		private static final int SDP_PBAP_SERVER_VERSION = 0x0102;
		// PBAP v1.2.3, Sec. 7.1.2: local phonebook and favorites
		private static final int SDP_PBAP_SUPPORTED_REPOSITORIES = 0x000B;
		private static final int SDP_PBAP_SUPPORTED_REPOSITORIES = 0x0009;
		private static final int SDP_PBAP_SUPPORTED_FEATURES = 0x021F;

		/* PBAP will use Bluetooth notification ID from 1000000 (included) to 2000000 (excluded).

system/blueberry/tests/sl4a_sl4a/gatt/gatt_connect_test.py

+7 −2

Original line number	Diff line number	Diff line
		@@ -23,13 +23,14 @@ from blueberry.tests.gd.cert.context import get_current_context
		from blueberry.tests.gd.cert.truth import assertThat
		from blueberry.tests.gd_sl4a.lib.bt_constants import adv_succ, ble_advertise_settings_modes, ble_scan_settings_modes, ble_address_types, ble_scan_settings_phys, gatt_connection_state_change, gatt_transport, scan_result
		from blueberry.tests.gd_sl4a.lib.ble_lib import generate_ble_scan_objects, generate_ble_advertise_objects
		from blueberry.tests.sl4a_sl4a.lib.sl4a_sl4a_base_test import Sl4aSl4aBaseTestClass
		from blueberry.tests.sl4a_sl4a.lib import sl4a_sl4a_base_test
		from blueberry.facade import common_pb2 as common

		from mobly import test_runner
		from mobly.controllers.android_device_lib.adb import AdbError


		class GattConnectTest(Sl4aSl4aBaseTestClass):
		class GattConnectTest(sl4a_sl4a_base_test.Sl4aSl4aBaseTestClass):

		def setup_class(self):
		super().setup_class()
		@@ -135,3 +136,7 @@ class GattConnectTest(Sl4aSl4aBaseTestClass):

		# Test over
		self.cert.sl4a.bleStopBleAdvertising(advertise_callback)


		if __name__ == '__main__':
		test_runner.main()

system/blueberry/tests/sl4a_sl4a/sl4a_sl4a_device_config.yaml

+3 −3

Original line number	Diff line number	Diff line
		@@ -5,12 +5,12 @@ TestBeds:
		AndroidDevice:
		- label: dut
		# Preferred client port number on the PC host side for SL4A
		client_port: '8895'
		client_port: '8893'
		# Preferred server port number forwarded from Android to the host PC
		# via adb for SL4A connections
		forwarded_port: '8899'
		forwarded_port: '8897'
		# Preferred server port used by SL4A on Android device
		server_port: '8899'
		server_port: '8897'
		serial: 'DUT'
		- label: cert
		# Preferred client port number on the PC host side for SL4A