diff options
| author | 2021-03-12 18:32:33 +0000 | |
|---|---|---|
| committer | 2021-03-12 18:32:33 +0000 | |
| commit | d783f90b6d169745eab559ea94dcd14848de937e (patch) | |
| tree | 10d64a4bbd494bfc68357953e51a7904086c0e7f | |
| parent | fa59a51450e7651cd1a3c289c374a3f362de4272 (diff) | |
| parent | 14d654f998468e23d6404e3b038a992fc0885033 (diff) | |
Merge "Make the doc of bootstrapAuthenticationRequest more accurate" am: 14d654f998
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629521
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0f906612bfe94da792139601dd7ce9d2280f4d67
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 23dcee6387b8..8244342eee19 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -14720,13 +14720,17 @@ public class TelephonyManager { * </ul> * @param appType icc application type, like {@link #APPTYPE_USIM} or {@link * #APPTYPE_ISIM} or {@link#APPTYPE_UNKNOWN} - * @param nafId Network Application Function(NAF) fully qualified domain name and - * the selected GBA mode. It shall contain two parts delimited by "@" sign. The first - * part is the constant string "3GPP-bootstrapping" (GBA_ME), - * "3GPP-bootstrapping-uicc" (GBA_ U), or "3GPP-bootstrapping-digest" (GBA_Digest), - * and the latter part shall be the FQDN of the NAF (e.g. - * "3GPP-bootstrapping@naf1.operator.com" or "3GPP-bootstrapping-uicc@naf1.operator.com", - * or "3GPP-bootstrapping-digest@naf1.operator.com"). + * @param nafId A URI to specify Network Application Function(NAF) fully qualified domain + * name (FQDN) and the selected GBA mode. The authority of the URI must contain two parts + * delimited by "@" sign. The first part is the constant string "3GPP-bootstrapping" (GBA_ME), + * "3GPP-bootstrapping-uicc" (GBA_ U), or "3GPP-bootstrapping-digest" (GBA_Digest). + * The second part shall be the FQDN of the NAF. The scheme of the URI is not actually used + * for the authentication, which may be set the same as the resource that the application is + * going to access. For example, the nafId can be + * "https://3GPP-bootstrapping@naf1.operator.com", + * "https://3GPP-bootstrapping-uicc@naf1.operator.com", + * "https://3GPP-bootstrapping-digest@naf1.operator.com", + * "ftps://3GPP-bootstrapping-digest@naf1.operator.com". * @param securityProtocol Security protocol identifier between UE and NAF. See * 3GPP TS 33.220 Annex H. Application can use * {@link UaSecurityProtocolIdentifier#createDefaultUaSpId}, |