diff options
| author | 2019-06-03 18:09:24 +0000 | |
|---|---|---|
| committer | 2019-06-03 18:09:24 +0000 | |
| commit | e2100ac8f229d19ca0c96fef8eda1adf40a2ba84 (patch) | |
| tree | e29bf09e2862a1e2e0f8c2dce422950471c6f7d9 | |
| parent | 4938d3e51873e04e2e8b02da6ea1a1501ad24460 (diff) | |
| parent | 016c72c8abfbae08eda269afb8923e8fc8a4ce44 (diff) | |
[automerger] Protect VPN dialogs against overlay. am: 016c72c8ab
Change-Id: I09148d777617ccb4852931250f1b70314c41da48
| -rw-r--r-- | packages/VpnDialogs/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/packages/VpnDialogs/AndroidManifest.xml b/packages/VpnDialogs/AndroidManifest.xml index a3d27ce8a3da..60ed3245bc2b 100644 --- a/packages/VpnDialogs/AndroidManifest.xml +++ b/packages/VpnDialogs/AndroidManifest.xml @@ -21,6 +21,7 @@ <uses-permission android:name="android.permission.CONTROL_VPN" /> <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> + <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/> <application android:label="VpnDialogs" android:allowBackup="false" > diff --git a/packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java b/packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java index 72ce9c4efdc0..09339743db5c 100644 --- a/packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java +++ b/packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java @@ -16,6 +16,8 @@ package com.android.vpndialogs; +import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; + import android.content.Context; import android.content.DialogInterface; import android.content.pm.PackageManager; @@ -78,6 +80,7 @@ public class ConfirmDialog extends AlertActivity setupAlert(); getWindow().setCloseOnTouchOutside(false); + getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); Button button = mAlert.getButton(DialogInterface.BUTTON_POSITIVE); button.setFilterTouchesWhenObscured(true); } |