Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56b28d4a authored by Marcus Hagerott's avatar Marcus Hagerott
Browse files

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
parent 396c9c5f

core/java/android/provider/ContactsContract.java

+2 −8
Original line number Diff line number Diff line
@@ -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;

        }



        /**