From c5ce835012be58cccced1278b303df8fb9b93646 Mon Sep 17 00:00:00 2001 From: Varun Shah Date: Thu, 29 Dec 2022 22:38:32 +0000 Subject: [PATCH] Add Nullable annotations to CommonDataKinds. Change-Id: Iaa542eb1bdf70e7f694e9a4943779d018fb80d80 Fixes: 259477833 Test: n/a --- core/api/current.txt | 16 ++++++++-------- core/java/android/provider/ContactsContract.java | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index b63b0aa9784a7..2335c09353fe4 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -35162,7 +35162,7 @@ package android.provider { } public static final class ContactsContract.CommonDataKinds.Email implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins { - method public static CharSequence getTypeLabel(android.content.res.Resources, int, CharSequence); + method public static CharSequence getTypeLabel(android.content.res.Resources, int, @Nullable CharSequence); method public static int getTypeLabelResource(int); field public static final String ADDRESS = "data1"; field public static final android.net.Uri CONTENT_FILTER_URI; @@ -35183,7 +35183,7 @@ package android.provider { } public static final class ContactsContract.CommonDataKinds.Event implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins { - method public static CharSequence getTypeLabel(android.content.res.Resources, int, CharSequence); + method public static CharSequence getTypeLabel(android.content.res.Resources, int, @Nullable CharSequence); method public static int getTypeResource(Integer); field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_event"; field public static final String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX"; @@ -35216,7 +35216,7 @@ package android.provider { public static final class ContactsContract.CommonDataKinds.Im implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins { method public static CharSequence getProtocolLabel(android.content.res.Resources, int, CharSequence); method public static int getProtocolLabelResource(int); - method public static CharSequence getTypeLabel(android.content.res.Resources, int, CharSequence); + method public static CharSequence getTypeLabel(android.content.res.Resources, int, @Nullable CharSequence); method public static int getTypeLabelResource(int); field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/im"; field public static final String CUSTOM_PROTOCOL = "data6"; @@ -35262,7 +35262,7 @@ package android.provider { } public static final class ContactsContract.CommonDataKinds.Organization implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins { - method public static CharSequence getTypeLabel(android.content.res.Resources, int, CharSequence); + method public static CharSequence getTypeLabel(android.content.res.Resources, int, @Nullable CharSequence); method public static int getTypeLabelResource(int); field public static final String COMPANY = "data1"; field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/organization"; @@ -35281,7 +35281,7 @@ package android.provider { } public static final class ContactsContract.CommonDataKinds.Phone implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins { - method public static CharSequence getTypeLabel(android.content.res.Resources, int, CharSequence); + method public static CharSequence getTypeLabel(android.content.res.Resources, int, @Nullable CharSequence); method public static int getTypeLabelResource(int); field public static final android.net.Uri CONTENT_FILTER_URI; field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/phone_v2"; @@ -35328,7 +35328,7 @@ package android.provider { } public static final class ContactsContract.CommonDataKinds.Relation implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins { - method public static CharSequence getTypeLabel(android.content.res.Resources, int, CharSequence); + method public static CharSequence getTypeLabel(android.content.res.Resources, int, @Nullable CharSequence); method public static int getTypeLabelResource(int); field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/relation"; field public static final String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX"; @@ -35352,7 +35352,7 @@ package android.provider { } public static final class ContactsContract.CommonDataKinds.SipAddress implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins { - method public static CharSequence getTypeLabel(android.content.res.Resources, int, CharSequence); + method public static CharSequence getTypeLabel(android.content.res.Resources, int, @Nullable CharSequence); method public static int getTypeLabelResource(int); field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/sip_address"; field public static final String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX"; @@ -35383,7 +35383,7 @@ package android.provider { } public static final class ContactsContract.CommonDataKinds.StructuredPostal implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins { - method public static CharSequence getTypeLabel(android.content.res.Resources, int, CharSequence); + method public static CharSequence getTypeLabel(android.content.res.Resources, int, @Nullable CharSequence); method public static int getTypeLabelResource(int); field public static final String CITY = "data7"; field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/postal-address_v2"; diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 363d035ea774b..bfc5afe61265f 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -6422,7 +6422,7 @@ public final class ContactsContract { * for {@link #TYPE_CUSTOM}. */ public static final CharSequence getTypeLabel(Resources res, int type, - CharSequence label) { + @Nullable CharSequence label) { if ((type == TYPE_CUSTOM || type == TYPE_ASSISTANT) && !TextUtils.isEmpty(label)) { return label; } else { @@ -6634,7 +6634,7 @@ public final class ContactsContract { * for {@link #TYPE_CUSTOM}. */ public static final CharSequence getTypeLabel(Resources res, int type, - CharSequence label) { + @Nullable CharSequence label) { if (type == TYPE_CUSTOM && !TextUtils.isEmpty(label)) { return label; } else { @@ -6842,7 +6842,7 @@ public final class ContactsContract { * for {@link #TYPE_CUSTOM}. */ public static final CharSequence getTypeLabel(Resources res, int type, - CharSequence label) { + @Nullable CharSequence label) { if (type == TYPE_CUSTOM && !TextUtils.isEmpty(label)) { return label; } else { @@ -7003,7 +7003,7 @@ public final class ContactsContract { * for {@link #TYPE_CUSTOM}. */ public static final CharSequence getTypeLabel(Resources res, int type, - CharSequence label) { + @Nullable CharSequence label) { if (type == TYPE_CUSTOM && !TextUtils.isEmpty(label)) { return label; } else { @@ -7210,7 +7210,7 @@ public final class ContactsContract { * for {@link #TYPE_CUSTOM}. */ public static final CharSequence getTypeLabel(Resources res, int type, - CharSequence label) { + @Nullable CharSequence label) { if (type == TYPE_CUSTOM && !TextUtils.isEmpty(label)) { return label; } else { @@ -7337,7 +7337,7 @@ public final class ContactsContract { * for {@link #TYPE_CUSTOM}. */ public static final CharSequence getTypeLabel(Resources res, int type, - CharSequence label) { + @Nullable CharSequence label) { if (type == TYPE_CUSTOM && !TextUtils.isEmpty(label)) { return label; } else { @@ -7433,7 +7433,7 @@ public final class ContactsContract { * for {@link #TYPE_CUSTOM}. */ public static final CharSequence getTypeLabel(Resources res, int type, - CharSequence label) { + @Nullable CharSequence label) { if (type == TYPE_CUSTOM && !TextUtils.isEmpty(label)) { return label; } else { @@ -7762,7 +7762,7 @@ public final class ContactsContract { * for {@link #TYPE_CUSTOM}. */ public static final CharSequence getTypeLabel(Resources res, int type, - CharSequence label) { + @Nullable CharSequence label) { if (type == TYPE_CUSTOM && !TextUtils.isEmpty(label)) { return label; } else {