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

Commit 368db11f authored by Marcus Hagerott's avatar Marcus Hagerott Committed by Android (Google) Code Review
Browse files

Merge "Improve comments for contacts local account"

parents cf823dc5 960c6cfc

core/java/android/provider/ContactsContract.java

+4 −0
Original line number Diff line number Diff line
@@ -2916,6 +2916,8 @@ 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));

        }
@@ -2933,6 +2935,8 @@ 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));

        }

core/res/res/values/config.xml

+4 −4
Original line number Diff line number Diff line
@@ -4183,15 +4183,15 @@ 


    <!-- The default value used for RawContacts.ACCOUNT_NAME when contacts are inserted without this

         column set. These contacts are stored locally on the device and will not be removed even

         if an android.account.Account with this name and type exists. A null string will be used

         if the value is left empty. When this is non-empty then config_rawContactsLocalAccountType

         if no android.account.Account with this name exists. A null string will be used if the

         value is left empty. When this is non-empty then config_rawContactsLocalAccountType

         should also be non-empty.  -->

    <string name="config_rawContactsLocalAccountName" translatable="false"></string>



    <!-- The default value used for RawContacts.ACCOUNT_TYPE when contacts are inserted without this

         column set. These contacts are stored locally on the device and will not be removed even

         if an android.account.Account with this name and type exists. A null string will be used

         if the value is left empty.  When this is non-empty then config_rawContactsLocalAccountName

         if no android.account.Account with this type exists. A null string will be used if the

         value is left empty.  When this is non-empty then config_rawContactsLocalAccountName

         should also be non-empty.-->

    <string name="config_rawContactsLocalAccountType" translatable="false"></string>

</resources>