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

Commit 076de20c authored by Motomu Utsumi's avatar Motomu Utsumi Committed by Android (Google) Code Review
Browse files

Merge "Add register_nsd_offload_engine to flags.aconfig" into main

parents 1e035590 158cdccf

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,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 @FlaggedApi("com.android.net.flags.register_nsd_offload_engine") public static final String REGISTER_NSD_OFFLOAD_ENGINE = "android.permission.REGISTER_NSD_OFFLOAD_ENGINE";

    field @FlaggedApi("android.net.platform.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/java/android/net/flags.aconfig

+6 −0
Original line number Diff line number Diff line
@@ -17,3 +17,9 @@ flag { 
    bug: "307898240"

}



flag {

  name: "register_nsd_offload_engine"

  namespace: "android_core_networking"

  description: "Flag for registerOffloadEngine API in NsdManager"

  bug: "294777050"

}

core/res/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ android_app { 
        "android.content.pm.flags-aconfig",

        "android.provider.flags-aconfig",

        "camera_platform_flags",

        "com.android.net.flags-aconfig",

        "android.net.platform.flags-aconfig",

        "com.android.window.flags.window-aconfig",

    ],

}

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -2331,12 +2331,12 @@ 
    <!-- 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")

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

        @hide This should only be used by system apps.

    -->

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

        android:protectionLevel="signature"

        android:featureFlag="com.android.net.flags.register_nsd_offload_engine" />

        android:featureFlag="android.net.platform.flags.register_nsd_offload_engine" />



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

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