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

Commit 60c910a6 authored by Kangping Dong's avatar Kangping Dong Committed by Gerrit Code Review
Browse files

Merge "[Thread] add Thread network permissions" into main

parents 253698da fa35b426

core/api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -357,6 +357,7 @@ package android { 
    field public static final String SYSTEM_APPLICATION_OVERLAY = "android.permission.SYSTEM_APPLICATION_OVERLAY";

    field public static final String SYSTEM_APPLICATION_OVERLAY = "android.permission.SYSTEM_APPLICATION_OVERLAY";

    field public static final String SYSTEM_CAMERA = "android.permission.SYSTEM_CAMERA";

    field public static final String SYSTEM_CAMERA = "android.permission.SYSTEM_CAMERA";

    field public static final String TETHER_PRIVILEGED = "android.permission.TETHER_PRIVILEGED";

    field public static final String TETHER_PRIVILEGED = "android.permission.TETHER_PRIVILEGED";

    field @FlaggedApi("com.android.net.thread.flags.thread_enabled") public static final String THREAD_NETWORK_PRIVILEGED = "android.permission.THREAD_NETWORK_PRIVILEGED";

    field public static final String TIS_EXTENSION_INTERFACE = "android.permission.TIS_EXTENSION_INTERFACE";

    field public static final String TIS_EXTENSION_INTERFACE = "android.permission.TIS_EXTENSION_INTERFACE";

    field public static final String TOGGLE_AUTOMOTIVE_PROJECTION = "android.permission.TOGGLE_AUTOMOTIVE_PROJECTION";

    field public static final String TOGGLE_AUTOMOTIVE_PROJECTION = "android.permission.TOGGLE_AUTOMOTIVE_PROJECTION";

    field public static final String TRIGGER_LOST_MODE = "android.permission.TRIGGER_LOST_MODE";

    field public static final String TRIGGER_LOST_MODE = "android.permission.TRIGGER_LOST_MODE";

core/res/AndroidManifest.xml

+7 −0
Original line number Original line Diff line number Diff line
@@ -2225,6 +2225,13 @@ 
    <permission android:name="android.permission.MANAGE_LOWPAN_INTERFACES"

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

        android:protectionLevel="signature|privileged" />

        android:protectionLevel="signature|privileged" />





    <!-- @SystemApi @hide Allows changing Thread network state and access to Thread network

        credentials such as Network Key and PSKc.

        <p>Not for use by third-party applications.

        @FlaggedApi("com.android.net.thread.flags.thread_enabled") -->

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

                android:protectionLevel="signature|privileged" />



    <!-- #SystemApi @hide Allows an app to bypass Private DNS.

    <!-- #SystemApi @hide Allows an app to bypass Private DNS.

         <p>Not for use by third-party applications.

         <p>Not for use by third-party applications.

         TODO: publish as system API in next API release. -->

         TODO: publish as system API in next API release. -->

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -438,6 +438,8 @@ applications that come with the platform 
        <permission name="android.permission.MANAGE_WIFI_NETWORK_SELECTION" />

        <permission name="android.permission.MANAGE_WIFI_NETWORK_SELECTION" />

        <!-- Permission needed for CTS test - ConcurrencyTest#testP2pSetWfdInfo -->

        <!-- Permission needed for CTS test - ConcurrencyTest#testP2pSetWfdInfo -->

        <permission name="android.permission.CONFIGURE_WIFI_DISPLAY" />

        <permission name="android.permission.CONFIGURE_WIFI_DISPLAY" />

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

        <permission name="android.permission.THREAD_NETWORK_PRIVILEGED"/>

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

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

        <permission name="android.permission.BIND_CARRIER_SERVICES"/>

        <permission name="android.permission.BIND_CARRIER_SERVICES"/>

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

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

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -588,6 +588,9 @@ 
    <!-- Permission needed for CTS test - ConcurrencyTest#testP2pSetWfdInfo -->

    <!-- Permission needed for CTS test - ConcurrencyTest#testP2pSetWfdInfo -->

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

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





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

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



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

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

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

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