Merge "MAP: Synchronize mMsgList to avoid extra MessageDeleted MNS event" (421d92eb) · Commits · e / os / android_packages_apps_Bluetooth

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

+15 −15

Original line number	Diff line number	Diff line
		@@ -1275,6 +1275,7 @@ public class BluetoothMapContentObserver {
		boolean listChanged = false;

		Cursor c;
		synchronized(getMsgListSms()) {
		if (mMapEventReportVersion == BluetoothMapUtils.MAP_EVENT_REPORT_V10) {
		c = mResolver.query(Sms.CONTENT_URI,
		SMS_PROJECTION_SHORT, null, null, null);
		@@ -1282,7 +1283,6 @@ public class BluetoothMapContentObserver {
		c = mResolver.query(Sms.CONTENT_URI,
		SMS_PROJECTION_SHORT_EXT, null, null, null);
		}
		synchronized(getMsgListSms()) {
		try {
		if (c != null && c.moveToFirst()) {
		do {
		@@ -1424,6 +1424,7 @@ public class BluetoothMapContentObserver {
		HashMap<Long, Msg> msgListMms = new HashMap<Long, Msg>();
		boolean listChanged = false;
		Cursor c;
		synchronized(getMsgListMms()) {
		if (mMapEventReportVersion == BluetoothMapUtils.MAP_EVENT_REPORT_V10) {
		c = mResolver.query(Mms.CONTENT_URI,
		MMS_PROJECTION_SHORT, null, null, null);
		@@ -1432,7 +1433,6 @@ public class BluetoothMapContentObserver {
		MMS_PROJECTION_SHORT_EXT, null, null, null);
		}

		synchronized(getMsgListMms()) {
		try{
		if (c != null && c.moveToFirst()) {
		do {