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

Commit 965d0246 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 12"

parents 98adb72d 110a5f9e

AndroidManifest.xml

+93 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.contacts"

          android:versionCode="10731"

          android:versionName="1.7.31">

          android:versionCode="10733"

          android:versionName="1.7.33">



    <uses-sdk

        android:minSdkVersion="21"
@@ -615,4 +615,95 @@ 
            android:value="true"/>



    </application>



    <!-- Allows the contacts app to see the activities and services needed

        to detect accounts and show actions in QuickContact. -->

    <queries>

        <!-- ContactsProvider2 -->

        <package android:name="com.android.providers.contacts"/>



        <!-- quickcontact actions and verbs -->

        <intent>

            <action android:name="android.intent.action.SENDTO" />

            <data android:scheme="imto" />

        </intent>

        <intent>

            <action android:name="android.intent.action.SENDTO" />

            <data android:scheme="xmpp" />

        </intent>

        <intent>

            <action android:name="android.intent.action.SENDTO" />

            <data android:scheme="mailto" />

        </intent>

        <intent>

            <action android:name="android.intent.action.SENDTO" />

            <data android:scheme="smsto" />

        </intent>

        <intent>

            <action android:name="android.intent.action.VIEW"/>

            <data android:scheme="geo"/>

        </intent>

        <!-- About card -->

        <intent>

            <!-- View CalendarContract Uris -->

            <action android:name="android.intent.action.VIEW"/>

            <data android:scheme="content" android:host="com.android.calendar"/>

        </intent>

        <intent>

            <action android:name="android.intent.action.VIEW"/>

            <data android:scheme="https"/>

        </intent>



        <!-- Account loading -->

        <intent>

            <action android:name="android.accounts.AccountAuthenticator"/>

        </intent>

        <intent>

            <action android:name="android.intent.action.VIEW" />

            <data android:scheme="content" android:host="com.android.contacts"

                android:mimeType="vnd.android.cursor.item/*" />

        </intent>



        <!-- calling -->

        <package android:name="com.android.dialer"/>

        <intent>

            <action android:name="android.intent.action.CALL" />

            <data android:scheme="tel" />

        </intent>

        <intent>

            <action android:name="android.intent.action.DIAL" />

            <data android:scheme="tel" />

        </intent>

        <intent>

            <action android:name="android.intent.action.CALL" />

            <data android:scheme="sip" />

        </intent>

        <intent>

            <action android:name="android.intent.action.DIAL" />

            <data android:scheme="sip" />

        </intent>

        <intent>

            <action android:name="android.intent.action.CALL" />

            <data android:scheme="voicemail" />

        </intent>

        <intent>

            <action android:name="android.intent.action.DIAL" />

            <data android:scheme="voicemail" />

        </intent>



        <!-- vcard export -->

        <intent>

            <action android:name="android.intent.action.CREATE_DOCUMENT" />

            <data android:mimeType="text/x-vcard" />

            <category android:name="android.intent.category.OPENABLE" />

        </intent>



        <!-- edit contact photo -->

        <intent>

            <action android:name="com.android.camera.action.CROP" />

            <data android:mimeType="image/*" />

        </intent>



    </queries>



</manifest>

lint-baseline.xml

+55 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 21): `android.provider.ContactsContract.SimContacts#getSimAccounts`"

        errorLine1="                        ContactsContract.SimContacts.getSimAccounts(mContext.getContentResolver());"

        errorLine2="                                                     ~~~~~~~~~~~~~~">

        <location

            file="packages/apps/Contacts/src/com/android/contacts/model/AccountTypeManager.java"

            line="541"

            column="54"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 21): `android.provider.ContactsContract.SimAccount#getAccountName`"

        errorLine1="                    simAccountWithDataSets.add(new AccountWithDataSet(simAccount.getAccountName(),"

        errorLine2="                                                                                 ~~~~~~~~~~~~~~">

        <location

            file="packages/apps/Contacts/src/com/android/contacts/model/AccountTypeManager.java"

            line="543"

            column="82"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 21): `android.provider.ContactsContract.SimAccount#getAccountType`"

        errorLine1="                            simAccount.getAccountType(), null));"

        errorLine2="                                       ~~~~~~~~~~~~~~">

        <location

            file="packages/apps/Contacts/src/com/android/contacts/model/AccountTypeManager.java"

            line="544"

            column="40"/>

    </issue>



    <issue

        id="NewApi"

        message="Cast from `PhoneAccountHandle` to `Parcelable` requires API level 23 (current min is 21)"
@@ -155,6 +188,28 @@ 
            column="26"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 21): `android.provider.ContactsContract.SimContacts#getSimAccounts`"

        errorLine1="                    ContactsContract.SimContacts.getSimAccounts("

        errorLine2="                                                 ~~~~~~~~~~~~~~">

        <location

            file="packages/apps/Contacts/src/com/android/contacts/util/DeviceLocalAccountTypeFactory.java"

            line="74"

            column="50"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 21): `android.provider.ContactsContract.SimAccount#getAccountType`"

        errorLine1="                        simAccount.getAccountType())) {"

        errorLine2="                                   ~~~~~~~~~~~~~~">

        <location

            file="packages/apps/Contacts/src/com/android/contacts/util/DeviceLocalAccountTypeFactory.java"

            line="77"

            column="36"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level 24 (current min is 21): `android.provider.ContactsContract.Directory#ENTERPRISE_CONTENT_URI`"

proguard.flags

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 
-keep class com.android.contacts.model.BuilderWrapper { *; }

-keep class com.android.contacts.model.Contact { *; }

-keep class com.android.contacts.model.ContactLoader { *; }

-keep class com.android.contacts.model.Cp2DeviceLocalAccountLocator { *; }

-keep class com.android.contacts.model.CPOWrapper { *; }

-keep class com.android.contacts.model.dataitem.DataItem { *; }

-keep class com.android.contacts.model.dataitem.DataKind { *; }

res/values-af/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ 
    <string name="activity_title_settings" msgid="4004290638426915162">"Instellings"</string>

    <string name="menu_settings" msgid="3524924670246877187">"Instellings"</string>

    <string name="menu_help" msgid="287801702920372292">"Hulp en terugvoer"</string>

    <string name="organization_company_and_title" msgid="7197631449041284518">"<xliff:g id="COMPANY_0">%2$s</xliff:g>, <xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>

    <string name="organization_entry_two_field" msgid="6034934619269052455">"<xliff:g id="FIRST">%1$s</xliff:g> • <xliff:g id="SECOND">%2$s</xliff:g>"</string>

    <string name="organization_entry_all_field" msgid="6724345890324437167">"<xliff:g id="COMPANY">%1$s</xliff:g> • <xliff:g id="DEPARTMENT">%2$s</xliff:g> • <xliff:g id="TITLE">%3$s</xliff:g>"</string>

    <string name="non_phone_caption" msgid="7343449684187013327">"Foonnommer"</string>

    <string name="non_phone_add_to_contacts" msgid="5472784294274676663">"Voeg by kontakte"</string>

    <string name="non_phone_close" msgid="2792373584950696532">"Maak toe"</string>
@@ -324,6 +325,7 @@ 
    <string name="sms" msgid="4246338112764847384">"Teksboodskap"</string>

    <string name="postal_address" msgid="5031809899673855074">"Adres"</string>

    <string name="ghostData_company" msgid="3873500610390675876">"Maatskappy"</string>

    <string name="ghostData_department" msgid="8610642449404163799">"Departement"</string>

    <string name="ghostData_title" msgid="8584897460662904533">"Titel"</string>

    <string name="label_notes" msgid="7134226125644463585">"Notas"</string>

    <string name="label_custom_field" msgid="4160584225306364924">"Gepasmaak"</string>

res/values-am/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ 
    <string name="activity_title_settings" msgid="4004290638426915162">"ቅንብሮች"</string>

    <string name="menu_settings" msgid="3524924670246877187">"ቅንብሮች"</string>

    <string name="menu_help" msgid="287801702920372292">"እገዛ እና ግብረመልስ"</string>

    <string name="organization_company_and_title" msgid="7197631449041284518">"<xliff:g id="COMPANY_0">%2$s</xliff:g>፣ <xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>

    <string name="organization_entry_two_field" msgid="6034934619269052455">"<xliff:g id="FIRST">%1$s</xliff:g> • <xliff:g id="SECOND">%2$s</xliff:g>"</string>

    <string name="organization_entry_all_field" msgid="6724345890324437167">"<xliff:g id="COMPANY">%1$s</xliff:g> • <xliff:g id="DEPARTMENT">%2$s</xliff:g> • <xliff:g id="TITLE">%3$s</xliff:g>"</string>

    <string name="non_phone_caption" msgid="7343449684187013327">"ስልክ ቁጥር:"</string>

    <string name="non_phone_add_to_contacts" msgid="5472784294274676663">"ወደ ዕውቂያዎች አክል"</string>

    <string name="non_phone_close" msgid="2792373584950696532">"ዝጋ"</string>
@@ -324,6 +325,7 @@ 
    <string name="sms" msgid="4246338112764847384">"የጽሑፍ መልዕክት"</string>

    <string name="postal_address" msgid="5031809899673855074">"አድራሻ"</string>

    <string name="ghostData_company" msgid="3873500610390675876">"ኩባንያ"</string>

    <string name="ghostData_department" msgid="8610642449404163799">"መምሪያ"</string>

    <string name="ghostData_title" msgid="8584897460662904533">"አርዕስት"</string>

    <string name="label_notes" msgid="7134226125644463585">"ማስታወሻዎች"</string>

    <string name="label_custom_field" msgid="4160584225306364924">"ብጁ"</string>