diff options
| author | Marcus Hagerott <mhagerott@google.com> | 2021-12-07 18:07:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-12-07 18:07:58 +0000 |
| commit | 93cbb9ada40bf87f4ec962cce6bb66b6d73bdfc1 (patch) | |
| tree | 336bbbd8f8b710d3bbdc0f486d802cf1f9dd42e5 /core/java/android | |
| parent | c0427c3c228e90596705ed7772c350e55382bef7 (diff) | |
| parent | 6000de4da088907d4b85f8ace6e98d6c661ff63f (diff) | |
Merge "Revert "Return null for contacts local account""
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 5036abc66a0b..eef1ff7c7703 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -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)); } /** |