Merge "MAP: Fix bugs in SDP search result handling" (d3a3f735) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/map/BluetoothMapContentObserver.java

+20 −21

Original line number	Diff line number	Diff line
		@@ -267,20 +267,7 @@ public class BluetoothMapContentObserver {
		mAccount = account;
		mMasInstance = masInstance;
		mMasId = mMasInstance.getMasId();

		mMapSupportedFeatures = mMasInstance.getRemoteFeatureMask();
		if (D) Log.d(TAG, "BluetoothMapContentObserver: Supported features " +
		Integer.toHexString(mMapSupportedFeatures) ) ;

		if((BluetoothMapUtils.MAP_FEATURE_EXTENDED_EVENT_REPORT_11_BIT
		& mMapSupportedFeatures) != 0){
		mMapEventReportVersion = BluetoothMapUtils.MAP_EVENT_REPORT_V11;
		}
		// Make sure support for all formats result in latest version returned
		if((BluetoothMapUtils.MAP_FEATURE_EVENT_REPORT_V12_BIT
		& mMapSupportedFeatures) != 0){
		mMapEventReportVersion = BluetoothMapUtils.MAP_EVENT_REPORT_V12;
		}
		setObserverRemoteFeatureMask(mMasInstance.getRemoteFeatureMask());

		if(account != null) {
		mAuthority = Uri.parse(account.mBase_uri).getAuthority();
		@@ -337,7 +324,8 @@ public class BluetoothMapContentObserver {
		}

		public void setObserverRemoteFeatureMask(int remoteSupportedFeatures) {
		mMapSupportedFeatures = remoteSupportedFeatures;
		mMapSupportedFeatures =
		remoteSupportedFeatures & BluetoothMapMasInstance.SDP_MAP_MAS_FEATURES;
		if ((BluetoothMapUtils.MAP_FEATURE_EXTENDED_EVENT_REPORT_11_BIT
		& mMapSupportedFeatures) != 0) {
		mMapEventReportVersion = BluetoothMapUtils.MAP_EVENT_REPORT_V11;
		@@ -346,9 +334,20 @@ public class BluetoothMapContentObserver {
		if ((BluetoothMapUtils.MAP_FEATURE_EVENT_REPORT_V12_BIT
		& mMapSupportedFeatures) != 0) {
		mMapEventReportVersion = BluetoothMapUtils.MAP_EVENT_REPORT_V12;
		} else if (((BluetoothMapUtils.MAP_FEATURE_PARTICIPANT_PRESENCE_CHANGE_BIT
		\| BluetoothMapUtils.MAP_FEATURE_PARTICIPANT_CHAT_STATE_CHANGE_BIT)
		& mMapSupportedFeatures)
		!= 0) {
		// Warning according to page 46/123 of MAP 1.3 spec
		Log.w(TAG,
		"setObserverRemoteFeatureMask: Extended Event Reports 1.2 is not set even"
		+ "though PARTICIPANT_PRESENCE_CHANGE_BIT or PARTICIPANT_CHAT_STATE_CHANGE_BIT"
		+ " were set, mMapSupportedFeatures=" + mMapSupportedFeatures);
		}
		if (V) Log.d(TAG, "setObserverRemoteFeatureMask : " + mMapEventReportVersion
		+ " mMapSupportedFeatures : " + mMapSupportedFeatures);
		if (D)
		Log.d(TAG,
		"setObserverRemoteFeatureMask: mMapEventReportVersion=" + mMapEventReportVersion
		+ " mMapSupportedFeatures=" + mMapSupportedFeatures);
		}

		private Map<Long, Msg> getMsgListSms() {
		@@ -738,12 +737,12 @@ public class BluetoothMapContentObserver {
		xmlEvtReport.startDocument("UTF-8", true);
		xmlEvtReport.text("\r\n");
		xmlEvtReport.startTag("", "MAP-event-report");
		if (mMapEventReportVersion == BluetoothMapUtils.MAP_EVENT_REPORT_V10) {
		xmlEvtReport.attribute("", "version", BluetoothMapUtils.MAP_V10_STR);
		if (mMapEventReportVersion == BluetoothMapUtils.MAP_EVENT_REPORT_V12) {
		xmlEvtReport.attribute("", "version", BluetoothMapUtils.MAP_V12_STR);
		} else if (mMapEventReportVersion == BluetoothMapUtils.MAP_EVENT_REPORT_V11) {
		xmlEvtReport.attribute("", "version", BluetoothMapUtils.MAP_V11_STR);
		} else {
		xmlEvtReport.attribute("", "version", BluetoothMapUtils.MAP_V12_STR);
		xmlEvtReport.attribute("", "version", BluetoothMapUtils.MAP_V10_STR);
		}
		xmlEvtReport.startTag("", "event");
		xmlEvtReport.attribute("", "type", eventType);

android/app/src/com/android/bluetooth/map/BluetoothMapMasInstance.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ public class BluetoothMapMasInstance implements IObexConnectionHandler {
		private static final int SDP_MAP_MAS_VERSION = 0x0102;

		/* TODO: Should these be adaptive for each MAS? - e.g. read from app? */
		private static final int SDP_MAP_MAS_FEATURES = 0x0000007F;
		static final int SDP_MAP_MAS_FEATURES = 0x0000007F;

		private ServerSession mServerSession = null;
		// The handle to the socket registration with SDP
		@@ -443,7 +443,7 @@ public class BluetoothMapMasInstance implements IObexConnectionHandler {

		public void setRemoteFeatureMask(int supportedFeatures) {
		if(V) Log.v(TAG, "setRemoteFeatureMask : Curr: "+ mRemoteFeatureMask);
		mRemoteFeatureMask = supportedFeatures;
		mRemoteFeatureMask = supportedFeatures & SDP_MAP_MAS_FEATURES;
		if (mObserver != null) {
		mObserver.setObserverRemoteFeatureMask(mRemoteFeatureMask);
		if(V) Log.v(TAG, "setRemoteFeatureMask : set: " + mRemoteFeatureMask);