diff options
| author | John Shao <johnshao@google.com> | 2021-01-07 18:48:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-07 18:48:18 +0000 |
| commit | 9a0e541b1725107b0c45a2a32d721ea816d2e6ba (patch) | |
| tree | bb98a37e749d1d0654d98401376e02f26cc0baac | |
| parent | d8ca2abbd46c6f979b37c588dd77e0c6957b8d85 (diff) | |
| parent | b423fdf941a10fc1498dcee0665e56fb1856bf4e (diff) | |
| download | Contacts-9a0e541b1725107b0c45a2a32d721ea816d2e6ba.tar.gz | |
Prevent overlays on vCard import flows am: b423fdf941
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/13263648
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie2a1dba10b4335f13e64831b18eba893f42a1c32
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/contacts/vcard/ImportVCardActivity.java | 3 | ||||
| -rw-r--r-- | src/com/android/contacts/vcard/SelectAccountActivity.java | 3 |
4 files changed, 8 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 1fd8e8b29..08288f83d 100644 --- a/Android.bp +++ b/Android.bp @@ -32,6 +32,6 @@ android_app { proguard_flags_files: ["proguard.flags"], }, - sdk_version: "current", + sdk_version: "system_current", min_sdk_version: "21", } diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e0814c1c6..c9dc980c9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -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" diff --git a/src/com/android/contacts/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java index 2c69cdfd6..38367c40f 100644 --- a/src/com/android/contacts/vcard/ImportVCardActivity.java +++ b/src/com/android/contacts/vcard/ImportVCardActivity.java @@ -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, diff --git a/src/com/android/contacts/vcard/SelectAccountActivity.java b/src/com/android/contacts/vcard/SelectAccountActivity.java index ac5b3eb71..eb13e505c 100644 --- a/src/com/android/contacts/vcard/SelectAccountActivity.java +++ b/src/com/android/contacts/vcard/SelectAccountActivity.java @@ -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 |