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

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

Merge "Annotate Part Uri as @NonNull" into qt-dev 

am: 7269961a

Change-Id: I4dbf5d1ef0172f177553a51a5b79fcc06e958a60
parents 68cc1aef 7269961a

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -39144,7 +39144,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 @NonNull 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

+1 −0
Original line number Diff line number Diff line
@@ -3039,6 +3039,7 @@ public final class Telephony { 
             * 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");



            /**