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

Commit 141f0f9a authored by John Shao's avatar John Shao Committed by Automerger Merge Worker
Browse files

Prevent overlays on vCard import flows am: b423fdf9 am: 028b7d4a am: 72a48fe8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/13263648

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf88506381ed74420c7e9027e2b83086e444a6b4
parents 48de8483 72a48fe8

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/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,

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

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

        super.onCreate(bundle);



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

            .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        // There's three possibilities:

        // - more than one accounts -> ask the user

        // - just one account -> use the account without asking the user