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

Commit bca8a668 authored by Bill Yi's avatar Bill Yi
Browse files

Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE 

Merged-In: I7d3934e1d3e2839199c169d31d89be9944837399
Merged-In: I2abe68f2b12ec8233870736cafe1e3e835bb71e4
Change-Id: If83aeb66b6572e32ca0a22eb7377146b5e671d8d
parents 44f6cef1 58d1b4ef

Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -63,6 +63,6 @@ android_app { 
        proguard_flags_files: ["proguard.flags"],

        proguard_flags_files: ["proguard.flags"],

    },

    },





    sdk_version: "current",

    sdk_version: "system_current",

    min_sdk_version: "21",

    min_sdk_version: "21",

}
 
}

AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,7 @@ 
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

    <!-- Required in P to run Service.startForeground() -->

    <!-- Required in P to run Service.startForeground() -->

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>

    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />





    <uses-feature

    <uses-feature

        android:name="android.hardware.telephony"

        android:name="android.hardware.telephony"

src/com/android/contacts/quickcontact/QuickContactActivity.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -768,7 +768,7 @@ public class QuickContactActivity extends ContactsActivity { 
        final boolean deletedOrSplit = requestCode == REQUEST_CODE_CONTACT_EDITOR_ACTIVITY &&

        final boolean deletedOrSplit = requestCode == REQUEST_CODE_CONTACT_EDITOR_ACTIVITY &&

                (resultCode == ContactDeletionInteraction.RESULT_CODE_DELETED ||

                (resultCode == ContactDeletionInteraction.RESULT_CODE_DELETED ||

                resultCode == ContactEditorActivity.RESULT_CODE_SPLIT);

                resultCode == ContactEditorActivity.RESULT_CODE_SPLIT);

        setResult(resultCode, data);

        setResult(resultCode);

        if (deletedOrSplit) {

        if (deletedOrSplit) {

            finish();

            finish();

        } else if (requestCode == REQUEST_CODE_CONTACT_SELECTION_ACTIVITY &&

        } else if (requestCode == REQUEST_CODE_CONTACT_SELECTION_ACTIVITY &&

src/com/android/contacts/util/ImplicitIntentsUtil.java

+1 −20
Original line number Original line Diff line number Diff line
@@ -102,30 +102,11 @@ public class ImplicitIntentsUtil { 
     */

     */

    public static void startQuickContact(Activity activity, Uri contactLookupUri,

    public static void startQuickContact(Activity activity, Uri contactLookupUri,

            int previousScreenType) {

            int previousScreenType) {

        startQuickContact(activity, contactLookupUri, previousScreenType, /* requestCode */ -1);

    }



    /**

     * Starts QuickContact for result with the default mode and specified previous screen type.

     */

    public static void startQuickContactForResult(Activity activity, Uri contactLookupUri,

            int previousScreenType, int requestCode) {

        startQuickContact(activity, contactLookupUri, previousScreenType, requestCode);

    }



    private static void startQuickContact(Activity activity, Uri contactLookupUri,

            int previousScreenType, int requestCode) {

        final Intent intent = ImplicitIntentsUtil.composeQuickContactIntent(

        final Intent intent = ImplicitIntentsUtil.composeQuickContactIntent(

                activity, contactLookupUri, previousScreenType);

                activity, contactLookupUri, previousScreenType);





        // We only start "for result" if specifically requested.

        if (requestCode >= 0) {

            intent.setPackage(activity.getPackageName());

            activity.startActivityForResult(intent, requestCode);

        } else {

        startActivityInApp(activity, intent);

        startActivityInApp(activity, intent);

    }

    }

    }





    /**

    /**

     * Returns an implicit intent for opening QuickContacts with the default mode and specified

     * Returns an implicit intent for opening QuickContacts with the default mode and specified

src/com/android/contacts/vcard/ImportVCardActivity.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -546,6 +546,9 @@ public class ImportVCardActivity extends Activity implements ImportVCardDialogFr 
    protected void onCreate(Bundle bundle) {

    protected void onCreate(Bundle bundle) {

        super.onCreate(bundle);

        super.onCreate(bundle);





        getWindow().addSystemFlags(android.view.WindowManager.LayoutParams

            .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        Uri sourceUri = getIntent().getData();

        Uri sourceUri = getIntent().getData();





        // Reading uris from non-storage needs the permission granted from the source intent,

        // Reading uris from non-storage needs the permission granted from the source intent,