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

Commit ae678d2c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Add RemoteAuthService" into main am: 183da587 am: 4b2455be... 

Merge "Merge "Add RemoteAuthService" into main am: 183da587 am: 4b2455be am: 9efc72ac am: 4d9a2f2e" into udc-qpr-dev-plus-aosp am: f8aea3cb

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



Change-Id: I66f2ffca4831aad0f77d49bd4917d1194ce6cf0e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87edae24 f8aea3cb

core/api/module-lib-current.txt

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

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

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

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

    field public static final String PAC_PROXY_SERVICE = "pac_proxy";

    field public static final String PAC_PROXY_SERVICE = "pac_proxy";

    field public static final String REMOTE_AUTH_SERVICE = "remote_auth";

    field public static final String TEST_NETWORK_SERVICE = "test_network";

    field public static final String TEST_NETWORK_SERVICE = "test_network";

  }

  }

core/java/android/content/Context.java

+12 −0
Original line number Original line Diff line number Diff line
@@ -6339,6 +6339,18 @@ public abstract class Context { 
    @SystemApi

    @SystemApi

    public static final String NEARBY_SERVICE = "nearby";

    public static final String NEARBY_SERVICE = "nearby";





    /**

     * Use with {@link #getSystemService(String)} to retrieve a

     * {@link android.remoteauth.RemoteAuthManager} to discover,

     * register and authenticate via remote authenticator  devices.

     *

     * @see #getSystemService(String)

     * @see android.remoteauth.RemoteAuthManager

     * @hide

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public static final String REMOTE_AUTH_SERVICE = "remote_auth";



    /**

    /**

     * Use with {@link #getSystemService(String)} to retrieve a

     * Use with {@link #getSystemService(String)} to retrieve a

     * {@link android.app.ambientcontext.AmbientContextManager}.

     * {@link android.app.ambientcontext.AmbientContextManager}.