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

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

Merge "Adds android.permission.REGISTER_NSD_OFFLOAD_ENGINE" into main am: a0ec1987 

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



Change-Id: Iefa43fd587ca0a794d56c1708e48ce8cf93d1e44
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 132c183b a0ec1987

core/api/system-current.txt

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -2225,6 +2225,14 @@ 
    <permission android:name="android.permission.MANAGE_ETHERNET_NETWORKS"

        android:protectionLevel="signature" />



    <!-- Allows system apps to call methods to register itself as a mDNS offload engine.

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

        @SystemApi

        @hide This should only be used by system apps.

    -->

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

        android:protectionLevel="signature" />



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

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

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