Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 823961a3 authored by Tom Taylor's avatar Tom Taylor Committed by Android (Google) Code Review
Browse files

Merge "Remove mms-common library"

parents a9729deb a87afd07

mms-common/java/com/android/mmscommon/ContentType.java→core/java/com/google/android/mms/ContentType.java

+1 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * limitations under the License.

 */



package com.android.mmscommon;

package com.google.android.mms;



import java.util.ArrayList;
@@ -26,7 +26,6 @@ public class ContentType { 
    public static final String MMS_GENERIC       = "application/vnd.wap.mms-generic";

    public static final String MULTIPART_MIXED   = "application/vnd.wap.multipart.mixed";

    public static final String MULTIPART_RELATED = "application/vnd.wap.multipart.related";

    public static final String MULTIPART_ALTERNATIVE = "application/vnd.wap.multipart.alternative";



    public static final String TEXT_PLAIN        = "text/plain";

    public static final String TEXT_HTML         = "text/html";

mms-common/java/com/android/mmscommon/InvalidHeaderValueException.java→core/java/com/google/android/mms/InvalidHeaderValueException.java

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * limitations under the License.

 */



package com.android.mmscommon;

package com.google.android.mms;



/**

 * Thrown when an invalid header value was set.

mms-common/java/com/android/mmscommon/MmsException.java→core/java/com/google/android/mms/MmsException.java

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * limitations under the License.

 */



package com.android.mmscommon;

package com.google.android.mms;



/**

 * A generic exception that is thrown by the Mms client.

core/java/com/google/android/mms/package.html

0 → 100755
+5 −0
Original line number Diff line number Diff line 
<body>



{@hide}



</body>

mms-common/java/com/android/mmscommon/mms/pdu/AcknowledgeInd.java→core/java/com/google/android/mms/pdu/AcknowledgeInd.java

+2 −3
Original line number Diff line number Diff line
@@ -15,10 +15,9 @@ 
 * limitations under the License.

 */



package com.android.mmscommon.mms.pdu;

package com.google.android.mms.pdu;



import com.android.mmscommon.InvalidHeaderValueException;

import com.android.mmscommon.PduHeaders;

import com.google.android.mms.InvalidHeaderValueException;



/**

 * M-Acknowledge.ind PDU.