From 56b28d4ad75712723e588e05dc5d0bd01af797b7 Mon Sep 17 00:00:00 2001 From: Marcus Hagerott Date: Wed, 21 Apr 2021 11:15:30 -0700 Subject: [PATCH] Return null for contacts local account In T+ the local account is required to be consistent with the what is used in the AOSP ContactsProvider and so RawContacts.getLocalAccountName and RawContacts.getLocalAccountType should always return null. Test: atest CtsContactsProviderTestCases Bug: 188347648 Bug: 197121153 Change-Id: I3b7143e3b96e5db53128f4b69b0eb606237f9f50 --- core/java/android/provider/ContactsContract.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index d1202649c8e07..28df119b1734d 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -2952,10 +2952,7 @@ public final class ContactsContract { */ @Nullable public static String getLocalAccountName(@NonNull Context context) { - // config_rawContactsLocalAccountName is defined in - // platform/frameworks/base/core/res/res/values/config.xml - return TextUtils.nullIfEmpty(context.getString( - com.android.internal.R.string.config_rawContactsLocalAccountName)); + return null; } /** @@ -2971,10 +2968,7 @@ public final class ContactsContract { */ @Nullable public static String getLocalAccountType(@NonNull Context context) { - // config_rawContactsLocalAccountType is defined in - // platform/frameworks/base/core/res/res/values/config.xml - return TextUtils.nullIfEmpty(context.getString( - com.android.internal.R.string.config_rawContactsLocalAccountType)); + return null; } /**