Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "am-641f3aa3-ebd9-46aa-8f39-1f4ec4f86eb3" into oc-dev

Browse Source 
* changes:
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8 am: 8c3a23e6b1 am: 22a1644e1f
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8 am: 8c3a23e6b1
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab
  Protect VPN dialogs against overlay.
This commit is contained in:
Bryan Ferris
2019-06-06 00:01:53 +00:00
committed by Android (Google) Code Review
parent 2ca66d4d10 3c61bed273
commit 7af053390a
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/VpnDialogs/AndroidManifest.xml
View File

@@ -21,6 +21,7 @@
<uses-permission android:name="android.permission.CONTROL_VPN" /> <uses-permission android:name="android.permission.CONTROL_VPN" />
<uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
<uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
<application android:label="VpnDialogs" <application android:label="VpnDialogs"
android:allowBackup="false" > android:allowBackup="false" >

3
packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java
View File

@@ -16,6 +16,8 @@
package com.android.vpndialogs; package com.android.vpndialogs;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
@@ -78,6 +80,7 @@ public class ConfirmDialog extends AlertActivity
setupAlert(); setupAlert();
getWindow().setCloseOnTouchOutside(false); getWindow().setCloseOnTouchOutside(false);
getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
Button button = mAlert.getButton(DialogInterface.BUTTON_POSITIVE); Button button = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
button.setFilterTouchesWhenObscured(true); button.setFilterTouchesWhenObscured(true);
} }