Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447 am: 40efe816dd am: e83d4f6c7d (49ba0747) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -39238,6 +39238,7 @@ package android.provider {
		}

		public static final class Telephony.Mms.Addr implements android.provider.BaseColumns {
		method @NonNull public static android.net.Uri getAddrUriForMessage(@NonNull String);
		field public static final String ADDRESS = "address";
		field public static final String CHARSET = "charset";
		field public static final String CONTACT_ID = "contact_id";
		@@ -39266,6 +39267,7 @@ package android.provider {
		}

		public static final class Telephony.Mms.Part implements android.provider.BaseColumns {
		method @NonNull public static android.net.Uri getPartUriForMessage(@NonNull String);
		field public static final String CHARSET = "chset";
		field public static final String CONTENT_DISPOSITION = "cd";
		field public static final String CONTENT_ID = "cid";

telephony/java/android/provider/Telephony.java

+35 −1

Original line number	Diff line number	Diff line
		@@ -3033,6 +3033,20 @@ public final class Telephony {
		* <P>Type: INTEGER</P>
		*/
		public static final String CHARSET = "charset";

		/**
		* Generates a Addr {@link Uri} for message, used to perform Addr table operation
		* for mms.
		*
		* @param messageId the messageId used to generate Addr {@link Uri} dynamically
		* @return the addrUri used to perform Addr table operation for mms
		*/
		@NonNull
		public static Uri getAddrUriForMessage(@NonNull String messageId) {
		Uri addrUri = Mms.CONTENT_URI.buildUpon()
		.appendPath(String.valueOf(messageId)).appendPath("addr").build();
		return addrUri;
		}
		}

		/**
		@@ -3050,12 +3064,17 @@ public final class Telephony {
		private Part() {
		}

		/**
		* The name of part table.
		*/
		private static final String TABLE_PART = "part";

		/**
		* The {@code content://} style URL for this table. Can be appended with a part ID to
		* address individual parts.
		*/
		@NonNull
		public static final Uri CONTENT_URI = Uri.withAppendedPath(Mms.CONTENT_URI, "part");
		public static final Uri CONTENT_URI = Uri.withAppendedPath(Mms.CONTENT_URI, TABLE_PART);

		/**
		* The identifier of the message which this part belongs to.
		@@ -3134,6 +3153,21 @@ public final class Telephony {
		* <P>Type: TEXT</P>
		*/
		public static final String TEXT = "text";

		/**
		* Generates a Part {@link Uri} for message, used to perform Part table operation
		* for mms.
		*
		* @param messageId the messageId used to generate Part {@link Uri} dynamically
		* @return the partUri used to perform Part table operation for mms
		*/
		@NonNull
		public static Uri getPartUriForMessage(@NonNull String messageId) {
		Uri partUri = Mms.CONTENT_URI.buildUpon()
		.appendPath(String.valueOf(messageId)).appendPath(
		TABLE_PART).build();
		return partUri;
		}
		}

		/**