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

Unverified Commit 6fe61f7c authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-11.0.0_r34' into staging/lineage-18.1_merge-android-11.0.0_r34 

Android 11.0.0 release 34

* tag 'android-11.0.0_r34':
  Stop returning intent data in QuickContact in onActivityResult
  Prevent overlays on vCard import flows

Change-Id: I4359a7312608ab14008fa537c26040e9a5753d99
parents 514d1ab1 58d1b4ef

Android.bp

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

    },



    sdk_version: "current",

    sdk_version: "system_current",

    min_sdk_version: "21",

}

AndroidManifest.xml

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

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

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

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



    <uses-feature

        android:name="android.hardware.telephony"

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

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

                (resultCode == ContactDeletionInteraction.RESULT_CODE_DELETED ||

                resultCode == ContactEditorActivity.RESULT_CODE_SPLIT);

        setResult(resultCode, data);

        setResult(resultCode);

        if (deletedOrSplit) {

            finish();

        } else if (requestCode == REQUEST_CODE_CONTACT_SELECTION_ACTIVITY &&

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

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

    public static void startQuickContact(Activity activity, Uri contactLookupUri,

            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(

                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);

    }

    }



    /**

     * 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 Diff line number Diff line
@@ -546,6 +546,9 @@ public class ImportVCardActivity extends Activity implements ImportVCardDialogFr 
    protected void onCreate(Bundle bundle) {

        super.onCreate(bundle);



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

            .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        Uri sourceUri = getIntent().getData();



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