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

Commit 330dc32a authored by Yan Yan's avatar Yan Yan Committed by Gerrit Code Review
Browse files

Merge "Expose VCN_MANAGEMENT_SERVICE constant as SystemApi" into main

parents 2a654f1a 337d1257

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ package android.content { 
    method @NonNull public android.os.UserHandle getUser();

    field public static final String PAC_PROXY_SERVICE = "pac_proxy";

    field public static final String TEST_NETWORK_SERVICE = "test_network";

    field @FlaggedApi("android.os.mainline_vcn_platform_api") public static final String VCN_MANAGEMENT_SERVICE = "vcn_management";

    field @FlaggedApi("android.webkit.update_service_ipc_wrapper") public static final String WEBVIEW_UPDATE_SERVICE = "webviewupdate";

  }

core/java/android/content/Context.java

+2 −0
Original line number Diff line number Diff line
@@ -4855,6 +4855,8 @@ public abstract class Context { 
     * @see android.net.vcn.VcnManager

     * @hide

     */

    @FlaggedApi(android.os.Flags.FLAG_MAINLINE_VCN_PLATFORM_API)

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public static final String VCN_MANAGEMENT_SERVICE = "vcn_management";



    /**