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

Commit e2100ac8 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Protect VPN dialogs against overlay. am: 016c72c8 

Change-Id: I09148d777617ccb4852931250f1b70314c41da48
parents 4938d3e5 016c72c8

packages/VpnDialogs/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" >

packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java

+3 −0
Original line number Diff line number Diff line
@@ -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);

    }