From 1510dc9a0a5814bedc640a1ac724438f385d2c8e Mon Sep 17 00:00:00 2001 From: Leland Miller Date: Thu, 11 Jul 2019 16:31:40 -0700 Subject: [PATCH] Add @NonNull annotation to CONTENT_URI Test: None, simple annotation Bug: 124791757 Change-Id: Ic56c4e15c73a414f7da257585578eaaaec5f9818 --- api/current.txt | 2 +- telephony/java/android/provider/Telephony.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index 015874d6e30cd..09f4355fae569 100755 --- a/api/current.txt +++ b/api/current.txt @@ -37412,7 +37412,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"; diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java index 83aa52176b875..094f8c2eb053f 100644 --- a/telephony/java/android/provider/Telephony.java +++ b/telephony/java/android/provider/Telephony.java @@ -2975,6 +2975,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"); /**