diff options
| author | 2023-07-31 16:13:31 +0000 | |
|---|---|---|
| committer | 2023-07-31 16:13:31 +0000 | |
| commit | 183da587791af78f37f2848658cdffd27eaaed71 (patch) | |
| tree | 13a6aa9104b5626df277e42df823e44dd8853179 | |
| parent | 6c737e8ca070063799cafa790f359085f1e1060f (diff) | |
| parent | 4d2dbf4a9b60f9a5030953bd6a3f0613c7a78cd9 (diff) | |
Merge "Add RemoteAuthService" into main
| -rw-r--r-- | core/api/module-lib-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 13a48993f68f..6a4c67b71250 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -90,6 +90,7 @@ package android.content { public abstract class Context { 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"; } diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 7de7c676706b..21d4b6461214 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -6059,6 +6059,18 @@ public abstract class Context { /** * 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}. * * @see #getSystemService(String) |