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

Commit 6d2e9b8c authored by Leland Miller's avatar Leland Miller Committed by android-build-merger
Browse files

Merge "Add part ID reuse to API contract" am: d49a6c86 am: ea65fcc9 

am: c5ceebba

Change-Id: Ide0ff27e0de513dd2687e3fc30e177cd1d5fd45c
parents 770a4129 c5ceebba

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -39084,6 +39084,7 @@ package android.provider { 
    field public static final String CONTENT_ID = "cid";

    field public static final String CONTENT_LOCATION = "cl";

    field public static final String CONTENT_TYPE = "ct";

    field public static final android.net.Uri CONTENT_URI;

    field public static final String CT_START = "ctt_s";

    field public static final String CT_TYPE = "ctt_t";

    field public static final String FILENAME = "fn";

telephony/java/android/provider/Telephony.java

+9 −0
Original line number Diff line number Diff line
@@ -2375,6 +2375,9 @@ public final class Telephony { 


        /**

         * Contains message parts.

         *

         * To avoid issues where applications might cache a part ID, the ID of a deleted part must

         * not be reused to point at a new part.

         */

        public static final class Part implements BaseColumns {
@@ -2385,6 +2388,12 @@ public final class Telephony { 
            private Part() {

            }



            /**

             * The {@code content://} style URL for this table. Can be appended with a part ID to

             * address individual parts.

             */

            public static final Uri CONTENT_URI = Uri.withAppendedPath(Mms.CONTENT_URI, "part");



            /**

             * The identifier of the message which this part belongs to.

             * <P>Type: INTEGER</P>