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

Commit 266c76f8 authored by Bryan Ferris's avatar Bryan Ferris Committed by Android (Google) Code Review
Browse files

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

* changes:
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8 am: e2100ac8
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8
  Protect VPN dialogs against overlay.
parents 6d72c068 caf19dfb

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);

    }

    }