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

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

Merge "Add NETWORK_BYPASS_PRIVATE_DNS permission" into pi-dev 

am: d64c07da

Change-Id: I77bec89592c594392e94da001f1e3992543b23ec
parents 5e5a150d d64c07da

core/res/AndroidManifest.xml

+6 −0
Original line number Original line Diff line number Diff line
@@ -1458,6 +1458,12 @@ 
    <permission android:name="android.permission.MANAGE_WIFI_WHEN_PERMISSION_REVIEW_REQUIRED"

    <permission android:name="android.permission.MANAGE_WIFI_WHEN_PERMISSION_REVIEW_REQUIRED"

        android:protectionLevel="signature" />

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

    <!-- Permissions for short range, peripheral networks -->

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

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

packages/CaptivePortalLogin/AndroidManifest.xml

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

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

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

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

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

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

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





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

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

                 android:usesCleartextTraffic="true">

                 android:usesCleartextTraffic="true">

packages/CarrierDefaultApp/AndroidManifest.xml

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

    <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.READ_PRIVILEGED_PHONE_STATE" />

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

    <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" />

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





    <application

    <application