Snap for 8429531 from 885d38d789c800a08ace237644af10e9d2fec596 to tm-qpr1-release (b1063a74) · Commits · e / os / android_packages_modules_Bluetooth

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -683,8 +683,10 @@ public class AdapterService extends Service {
		void startProfileServices() {
		debugLog("startCoreServices()");
		Class[] supportedProfileServices = Config.getSupportedProfiles();
		if (supportedProfileServices.length == 1 && GattService.class.getSimpleName()
		.equals(supportedProfileServices[0].getSimpleName())) {
		// If we support no profiles, or we only support GATT/BLE, just move on to BREDR_STARTED
		if (supportedProfileServices.length == 0
		\|\| (supportedProfileServices.length == 1 && GattService.class.getSimpleName()
		.equals(supportedProfileServices[0].getSimpleName()))) {
		mAdapterProperties.onBluetoothReady();
		updateUuids();
		setBluetoothClassFromConfig();
		@@ -700,8 +702,10 @@ public class AdapterService extends Service {
		mAdapterProperties.setScanMode(AbstractionLayer.BT_SCAN_MODE_NONE);

		Class[] supportedProfileServices = Config.getSupportedProfiles();
		if (supportedProfileServices.length == 1 && (mRunningProfiles.size() == 1
		&& GattService.class.getSimpleName().equals(mRunningProfiles.get(0).getName()))) {
		// If we support no profiles, or we only support GATT/BLE, just move on to BREDR_STOPPED
		if (supportedProfileServices.length == 0
		\|\| (supportedProfileServices.length == 1 && (mRunningProfiles.size() == 1
		&& GattService.class.getSimpleName().equals(mRunningProfiles.get(0).getName())))) {
		debugLog("stopProfileServices() - No profiles services to stop or already stopped.");
		mAdapterStateMachine.sendMessage(AdapterState.BREDR_STOPPED);
		} else {

system/stack/sdp/sdp_db.cc

+1 −2

Original line number	Diff line number	Diff line
		@@ -435,8 +435,7 @@ bool SDP_AddAttribute(uint32_t handle, uint16_t attr_id, uint8_t attr_type,
		attr_len, SDP_MAX_PAD_LEN - p_rec->free_pad_ptr);

		attr_len = SDP_MAX_PAD_LEN - p_rec->free_pad_ptr;
		p_val[SDP_MAX_PAD_LEN - p_rec->free_pad_ptr] = '\0';
		p_val[SDP_MAX_PAD_LEN - p_rec->free_pad_ptr + 1] = '\0';
		p_val[SDP_MAX_PAD_LEN - p_rec->free_pad_ptr - 1] = '\0';
		} else
		attr_len = 0;
		}