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

Commit d2562f3f authored by Yuyang Huang's avatar Yuyang Huang Committed by Automerger Merge Worker
Browse files

Merge "Add feature flag for REGISTER_NSD_OFFLOAD_ENGINE permission" into main... 

Merge "Add feature flag for REGISTER_NSD_OFFLOAD_ENGINE permission" into main am: 701dd4af am: 3d3e54aa am: c77885c4

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



Change-Id: I97eb6c420ec58f0787b2b71acd9c26be0e2eee6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36238928 c77885c4

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,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 @FlaggedApi("com.android.net.flags.register_nsd_offload_engine") 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

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

        @FlaggedApi("com.android.net.flags.register_nsd_offload_engine")

        @hide This should only be used by system apps.

    -->

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