diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2018-05-01 22:54:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-01 22:54:34 -0700 |
| commit | ee183a2571c8b4c96c55785a714b2947461c27cc (patch) | |
| tree | f79e0f875313a66cb2a7f40644da8fda27aa0465 | |
| parent | 6f26ca27c8e714861279b87cc0957150f4f39258 (diff) | |
| parent | 8d1ee96e0eaf2349431cc12f85bbeb3133fbbb19 (diff) | |
Merge "Add NETWORK_BYPASS_PRIVATE_DNS permission" into pi-dev am: d64c07da37
am: 8d1ee96e0e
Change-Id: I0d3429faddc0509781c896608039e4143cb1e8fd
| -rw-r--r-- | core/res/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | packages/CaptivePortalLogin/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | packages/CarrierDefaultApp/AndroidManifest.xml | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 21c769e3c04a..87fa864579dd 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1458,6 +1458,12 @@ <permission android:name="android.permission.MANAGE_WIFI_WHEN_PERMISSION_REVIEW_REQUIRED" android:protectionLevel="signature" /> + <!-- #SystemApi @hide Allows an app to bypass Private DNS. + <p>Not for use by third-party applications. + TODO: publish as system API in next API release. --> + <permission android:name="android.permission.NETWORK_BYPASS_PRIVATE_DNS" + android:protectionLevel="signature" /> + <!-- ======================================= --> <!-- Permissions for short range, peripheral networks --> <!-- ======================================= --> diff --git a/packages/CaptivePortalLogin/AndroidManifest.xml b/packages/CaptivePortalLogin/AndroidManifest.xml index 5fc9627e39c9..72e37ed4756e 100644 --- a/packages/CaptivePortalLogin/AndroidManifest.xml +++ b/packages/CaptivePortalLogin/AndroidManifest.xml @@ -23,6 +23,7 @@ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> <uses-permission android:name="android.permission.NETWORK_SETTINGS" /> + <uses-permission android:name="android.permission.NETWORK_BYPASS_PRIVATE_DNS" /> <application android:label="@string/app_name" android:usesCleartextTraffic="true"> diff --git a/packages/CarrierDefaultApp/AndroidManifest.xml b/packages/CarrierDefaultApp/AndroidManifest.xml index 824d9f45c21e..4d9aaecb4092 100644 --- a/packages/CarrierDefaultApp/AndroidManifest.xml +++ b/packages/CarrierDefaultApp/AndroidManifest.xml @@ -25,6 +25,7 @@ <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" /> <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" /> <uses-permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS" /> + <uses-permission android:name="android.permission.NETWORK_BYPASS_PRIVATE_DNS" /> <uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" /> <application |