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

Commit 8777070d authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Add NETWORK_BYPASS_PRIVATE_DNS permission" 

am: 50e7fe78

Change-Id: I368bbdf5b222eba7d0d300ced640639531f51482
parents caa34190 50e7fe78

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -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 -->

    <!-- ======================================= -->

packages/CaptivePortalLogin/AndroidManifest.xml

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

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

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

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



    <application android:label="@string/app_name" >

        <activity

packages/CarrierDefaultApp/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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