commit e7ed8ffebb686d87ebb9aebc7f96e9c8efd9a8d5
author Remi NGUYEN VAN <reminv@google.com> Wed Apr 25 17:46:10 2018 +0900
committer Remi NGUYEN VAN <reminv@google.com> Tue May 08 11:57:10 2018 +0900
tree 5e648d45b35a4a3e6b53ae6a5edc4206086da369
parent 6fa8d06c78d21d455015e19691d5d6f2e6bd258b

Add NETWORK_BYPASS_PRIVATE_DNS permission

Have the captive portal app and the MMS service use this new permission
to bypass private DNS.

This cherry-pick does not have the TODO and #SystemApi comments
deemed unnecessary in the original change.
Bug: b/78494660
Test: manual: captive portal login works
Merged-In: I0d3429faddc0509781c896608039e4143cb1e8fd
Merged-In: I77bec89592c594392e94da001f1e3992543b23ec
(cherry-pick of I0a4a8d0105becf6957fd44099bd84eca51e6716f, manual merge)

Change-Id: I041d123ccd9bb1af730a97707cce9003b552cffa

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 20a5afe..45d02b1 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1392,6 +1392,11 @@
     <permission android:name="android.permission.MANAGE_LOWPAN_INTERFACES"
         android:protectionLevel="signature|privileged" />
 
+    <!-- @hide Allows an app to bypass Private DNS.
+         <p>Not for use by third-party applications. -->
+    <permission android:name="android.permission.NETWORK_BYPASS_PRIVATE_DNS"
+        android:protectionLevel="signature" />
+
     <!-- ======================================= -->
     <!-- Permissions for short range, peripheral networks -->
     <!-- ======================================= -->