Merge "PBAPS: Don't filter out DateTime when requested" (57a0f6de) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java

+22 −15

Original line number	Original line	Diff line number	Diff line
	@@ -759,7 +759,7 @@ public class BluetoothPbapVcardManager {
	NOTE( 17, "NOTE", false, false),		NOTE( 17, "NOTE", false, false),
	URL( 20, "URL", false, false),		URL( 20, "URL", false, false),
	NICKNAME( 23, "NICKNAME", false, true),		NICKNAME( 23, "NICKNAME", false, true),
	DATETIME( 28, "DATETIME", false, true);		DATETIME( 28, "X-IRMC-CALL-DATETIME", false, false);

	public final int pos;		public final int pos;
	public final String prop;		public final String prop;
	@@ -817,12 +817,19 @@ public class BluetoothPbapVcardManager {

	// Since PBAP does not have filter bits for IM and SIP,		// Since PBAP does not have filter bits for IM and SIP,
	// exclude them by default. Easiest way is to exclude all		// exclude them by default. Easiest way is to exclude all
	// X- fields....		// X- fields, except date time....
	if (currentProp.startsWith("X-")) filteredIn = false;		if (currentProp.startsWith("X-")) {
			filteredIn = false;
			if (currentProp.equals("X-IRMC-CALL-DATETIME")) {
			filteredIn = true;
			}
			}
	}		}

	// Build filtered vCard		// Build filtered vCard
	if (filteredIn) filteredVCard.append(line + SEPARATOR);		if (filteredIn) {
			filteredVCard.append(line + SEPARATOR);
			}
	}		}

	return filteredVCard.toString();		return filteredVCard.toString();