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

Merge "Revert "Return null for contacts local account""

Browse Source
This commit is contained in:
Marcus Hagerott
2021-12-07 18:07:58 +00:00
committed by Android (Google) Code Review
parent c0427c3c22 6000de4da0
commit 93cbb9ada4
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2956,7 +2956,10 @@ public final class ContactsContract {
*/
@Nullable
public static String getLocalAccountName(@NonNull Context context) {
return null;
// 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));
}
/**
@@ -2972,7 +2975,10 @@ public final class ContactsContract {
*/
@Nullable
public static String getLocalAccountType(@NonNull Context context) {
return null;
// 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));
}
/**