am bac00c45: Merge "MAP: Set Empty name or address for unknown values in GetMessageListing." (faf6e82a) · Commits · e / os / android_packages_modules_Bluetooth

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -493,7 +493,7 @@ public class BluetoothMapContent {
		private void setRecipientAddressing(BluetoothMapMessageListingElement e, Cursor c,
		FilterInfo fi, BluetoothMapAppParams ap) {
		if ((ap.getParameterMask() & MASK_RECIPIENT_ADDRESSING) != 0) {
		String address = null;
		String address = "";
		if (fi.msgType == FilterInfo.TYPE_SMS) {
		int msgType = c.getInt(c.getColumnIndex(Sms.TYPE));
		if (msgType == 1) {
		@@ -513,7 +513,7 @@ public class BluetoothMapContent {
		private void setRecipientName(BluetoothMapMessageListingElement e, Cursor c,
		FilterInfo fi, BluetoothMapAppParams ap) {
		if ((ap.getParameterMask() & MASK_RECIPIENT_NAME) != 0) {
		String name = null;
		String name = "";
		if (fi.msgType == FilterInfo.TYPE_SMS) {
		int msgType = c.getInt(c.getColumnIndex(Sms.TYPE));
		if (msgType != 1) {
		@@ -555,7 +555,7 @@ public class BluetoothMapContent {
		private void setSenderName(BluetoothMapMessageListingElement e, Cursor c,
		FilterInfo fi, BluetoothMapAppParams ap) {
		if ((ap.getParameterMask() & MASK_SENDER_NAME) != 0) {
		String name = null;
		String name = "";
		if (fi.msgType == FilterInfo.TYPE_SMS) {
		int msgType = c.getInt(c.getColumnIndex(Sms.TYPE));
		if (msgType == 1) {
		@@ -685,7 +685,7 @@ public class BluetoothMapContent {
		}

		private String getContactNameFromPhone(String phone) {
		String name = null;
		String name = "";

		Uri uri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI,
		Uri.encode(phone));