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

Commit f051090a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Thread] add permission THREAD_NETWORK_TESTING for guarding testing... 

Merge "[Thread] add permission THREAD_NETWORK_TESTING for guarding testing APIs or shell commands" into main am: 6a7f2787 am: e2447a31

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3088206



Change-Id: Id7bf830a51dfb26f644c539c8335f1523ff34ac0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35bade04 e2447a31

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -2291,6 +2291,11 @@ 
    <permission android:name="android.permission.THREAD_NETWORK_PRIVILEGED"

                android:protectionLevel="signature|privileged" />



    <!-- @hide Allows access to Thread network APIs or shell commands ("cmd thread_network") which

        are only for testing. -->

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

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

packages/Shell/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -610,6 +610,8 @@ 


    <!-- Permission required for CTS test - CtsThreadNetworkTestCases -->

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

    <!-- Permission required to access Thread network shell commands for testing -->

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



    <!-- Permission required for CTS tests to enable/disable rate limiting toasts. -->

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