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

Commit 016c72c8 authored by Chalard Jean's avatar Chalard Jean Committed by Bryan Ferris
Browse files

Protect VPN dialogs against overlay. 

Bug: 130568701
Test: manual. After this, can't display on top of it
Change-Id: Ib032f800edb0416cc15f01a34954340d0d0ffa78
Merged-In: Ib032f800edb0416cc15f01a34954340d0d0ffa78
(cherry picked from commit 4e80dc2861614d25a1f957f50040a8cf04812d11)
parent fe9f143d

packages/VpnDialogs/AndroidManifest.xml

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

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

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

    }

    }