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

Commit 5d21251f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move API to be used in MODULE_LIBRARY" into main

parents 70978f00 a952f124

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ package android.content { 
    method @NonNull public android.content.Context createContextForSdkInSandbox(@NonNull android.content.pm.ApplicationInfo, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method @NonNull public android.os.IBinder getProcessToken();

    method @NonNull public android.os.UserHandle getUser();

    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence_module") public static final int BIND_FOREGROUND_SERVICE = 67108864; // 0x4000000

    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";

core/java/android/content/Context.java

+5 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.content; 


import static android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER;

import static android.content.flags.Flags.FLAG_ENABLE_BIND_PACKAGE_ISOLATED_PROCESS;

import static android.app.ondeviceintelligence.flags.Flags.FLAG_ENABLE_ON_DEVICE_INTELLIGENCE_MODULE;

import static android.security.Flags.FLAG_SECURE_LOCKDOWN;



import android.annotation.AttrRes;
@@ -640,12 +641,15 @@ public abstract class Context { 
    public static final int BIND_FOREGROUND_SERVICE_WHILE_AWAKE = 0x02000000;



    /**

     * @hide Flag for {@link #bindService}: For only the case where the binding

     * Flag for {@link #bindService}: For only the case where the binding

     * is coming from the system, set the process state to BOUND_FOREGROUND_SERVICE

     * instead of the normal maximum of IMPORTANT_FOREGROUND.  That is, this is

     * saying that the process shouldn't participate in the normal power reduction

     * modes (removing network access etc).

     * @hide

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @FlaggedApi(FLAG_ENABLE_ON_DEVICE_INTELLIGENCE_MODULE)

    public static final int BIND_FOREGROUND_SERVICE = 0x04000000;



    /**