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

Commit f8aea3cb authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
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
parents 5ac2acc2 72e7b245
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ package android.content {
    method @NonNull public android.os.IBinder getProcessToken();
    method @NonNull public android.os.UserHandle getUser();
    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";
  }

+12 −0
Original line number Diff line number Diff line
@@ -6339,6 +6339,18 @@ public abstract class Context {
    @SystemApi
    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
     * {@link android.app.ambientcontext.AmbientContextManager}.