Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return null for contacts local account

Browse Source 
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
This commit is contained in:
Marcus Hagerott
2021-04-21 11:15:30 -07:00
parent 396c9c5f5d
commit 56b28d4ad7
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/provider/ContactsContract.java
View File

@@ -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;
}
/**