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

Commit f893fbb8 authored by Chalard Jean's avatar Chalard Jean Committed by android-build-merger
Browse files

Merge "Protect VPN dialogs against overlay." into qt-dev am: e02360b5 

am: 948ade01

Change-Id: Ia9e060034dcbc3803936a38948e289a6e40938fc
parents 494b6c8f 948ade01

packages/VpnDialogs/AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
    <uses-permission android:name="android.permission.CONTROL_VPN" />

    <uses-permission android:name="android.permission.CONTROL_VPN" />

    <uses-permission android:name="android.permission.CONTROL_ALWAYS_ON_VPN" />

    <uses-permission android:name="android.permission.CONTROL_ALWAYS_ON_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/AlwaysOnDisconnectedDialog.java

+7 −3
Original line number Original line Diff line number Diff line
@@ -16,6 +16,10 @@ 




package com.android.vpndialogs;

package com.android.vpndialogs;





import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;

import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;



import android.content.Context;

import android.content.Context;

import android.content.DialogInterface;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.Intent;
@@ -31,7 +35,6 @@ import android.text.method.LinkMovementMethod; 
import android.text.style.ClickableSpan;

import android.text.style.ClickableSpan;

import android.util.Log;

import android.util.Log;

import android.view.View;

import android.view.View;

import android.view.WindowManager;

import android.widget.TextView;

import android.widget.TextView;





import com.android.internal.app.AlertActivity;

import com.android.internal.app.AlertActivity;
@@ -74,8 +77,9 @@ public class AlwaysOnDisconnectedDialog extends AlertActivity 
        setupAlert();

        setupAlert();





        getWindow().setCloseOnTouchOutside(false);

        getWindow().setCloseOnTouchOutside(false);

        getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);

        getWindow().setType(TYPE_SYSTEM_ALERT);

        getWindow().addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);

        getWindow().addFlags(FLAG_ALT_FOCUSABLE_IM);

        getWindow().addPrivateFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

    }

    }





    @Override

    @Override

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.SYSTEM_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;
@@ -79,6 +81,7 @@ public class ConfirmDialog extends AlertActivity 
        setupAlert();

        setupAlert();





        getWindow().setCloseOnTouchOutside(false);

        getWindow().setCloseOnTouchOutside(false);

        getWindow().addPrivateFlags(SYSTEM_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);

    }

    }