summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-08-23 19:16:04 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-08-23 19:16:04 +0000
commit44392d20a9d47cf5c4709ddcb879a192d961e4e0 (patch)
treeb3444d662a5eb2ba774ea56262cdda61fcafa2b1
parentb46a5d05188e749240054d45c112dce39fa17632 (diff)
parentd1b2d7dbf1ebf7ffcf522d65cdc96523e3e72bb2 (diff)
downloadbase-aml_rkp_341015010.tar.gz
Snap for 10703434 from d1b2d7dbf1ebf7ffcf522d65cdc96523e3e72bb2 to mainline-rkpd-releaseaml_rkp_341015010
Change-Id: I798e2f69a0b7e5c02060f9a5a9ec57129224f8e1
-rw-r--r--core/api/module-lib-current.txt1
-rw-r--r--core/java/android/content/Context.java12
2 files changed, 13 insertions, 0 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index c1f6219025f9..d27ff75fdf54 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -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";
}
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 6d82922484bc..b5b2e6582969 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -6334,6 +6334,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)