From: Xin Li <delphij@google.com>
Date: Tue, 13 Aug 2019 23:36:37 +0000 (-0700)
Subject: DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1702a9da19190418d645131bf9022d27d1c0f3b9;p=android-x86%2Fframeworks-base.git

DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master

Bug: 139369544
Change-Id: I835905a51836e7218f0be8c25335b9548ae6b2d3
---

1702a9da19190418d645131bf9022d27d1c0f3b9
diff --cc packages/VpnDialogs/AndroidManifest.xml
index 1d0b9b6d83db,05ce96ca7cb3..1f49aa1015d3
--- a/packages/VpnDialogs/AndroidManifest.xml
+++ b/packages/VpnDialogs/AndroidManifest.xml
@@@ -20,8 -20,8 +20,9 @@@
          package="com.android.vpndialogs">
  
      <uses-permission android:name="android.permission.CONTROL_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.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
  
      <application android:label="VpnDialogs"
                   android:allowBackup="false">