Merge "Revert "Don't send MAP new message events if older than one year"" into tm-qpr-dev (fe6526ee) · Commits · e / os / android_packages_modules_Bluetooth

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

+4 −16

Original line number	Original line	Diff line number	Diff line
	@@ -1461,14 +1461,8 @@ public class BluetoothMapContentObserver {
	if (mTransmitEvents && // extract contact details only if needed		if (mTransmitEvents && // extract contact details only if needed
	mMapEventReportVersion		mMapEventReportVersion
	> BluetoothMapUtils.MAP_EVENT_REPORT_V10) {		> BluetoothMapUtils.MAP_EVENT_REPORT_V10) {
	long timestamp = c.getLong(c.getColumnIndex(Sms.DATE));		String date = BluetoothMapUtils.getDateTimeString(
	String date = BluetoothMapUtils.getDateTimeString(timestamp);		c.getLong(c.getColumnIndex(Sms.DATE)));
	if (BluetoothMapUtils.isDateTimeOlderThanOneYear(timestamp)) {
	// Skip sending new message events older than one year
	listChanged = false;
	msgListSms.remove(id);
	continue;
	}
	String subject = c.getString(c.getColumnIndex(Sms.BODY));		String subject = c.getString(c.getColumnIndex(Sms.BODY));
	if (subject == null) {		if (subject == null) {
	subject = "";		subject = "";
	@@ -1639,14 +1633,8 @@ public class BluetoothMapContentObserver {
	if (mTransmitEvents && // extract contact details only if needed		if (mTransmitEvents && // extract contact details only if needed
	mMapEventReportVersion		mMapEventReportVersion
	!= BluetoothMapUtils.MAP_EVENT_REPORT_V10) {		!= BluetoothMapUtils.MAP_EVENT_REPORT_V10) {
	long timestamp = c.getLong(c.getColumnIndex(Mms.DATE));		String date = BluetoothMapUtils.getDateTimeString(
	String date = BluetoothMapUtils.getDateTimeString(timestamp);		c.getLong(c.getColumnIndex(Mms.DATE)));
	if (BluetoothMapUtils.isDateTimeOlderThanOneYear(timestamp)) {
	// Skip sending new message events older than one year
	listChanged = false;
	msgListMms.remove(id);
	continue;
	}
	String subject = c.getString(c.getColumnIndex(Mms.SUBJECT));		String subject = c.getString(c.getColumnIndex(Mms.SUBJECT));
	if (subject == null \|\| subject.length() == 0) {		if (subject == null \|\| subject.length() == 0) {
	/* Get subject from mms text body parts - if any exists */		/* Get subject from mms text body parts - if any exists */

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

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -677,21 +677,6 @@ public class BluetoothMapUtils {
	return format.format(cal.getTime());		return format.format(cal.getTime());
	}		}

	static boolean isDateTimeOlderThanOneYear(long timestamp) {
	Calendar cal = Calendar.getInstance();
	cal.setTimeInMillis(timestamp);
	Calendar oneYearAgo = Calendar.getInstance();
	oneYearAgo.add(Calendar.YEAR, -1);
	if (cal.compareTo(oneYearAgo) > 0) {
	if (V) {
	Log.v(TAG, "isDateTimeOlderThanOneYear timestamp : " + timestamp
	+ " oneYearAgo: " + oneYearAgo);
	}
	return true;
	}
	return false;
	}

	static void savePeerSupportUtcTimeStamp(int remoteFeatureMask) {		static void savePeerSupportUtcTimeStamp(int remoteFeatureMask) {
	if ((remoteFeatureMask & MAP_FEATURE_DEFINED_TIMESTAMP_FORMAT_BIT)		if ((remoteFeatureMask & MAP_FEATURE_DEFINED_TIMESTAMP_FORMAT_BIT)
	== MAP_FEATURE_DEFINED_TIMESTAMP_FORMAT_BIT) {		== MAP_FEATURE_DEFINED_TIMESTAMP_FORMAT_BIT) {