Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make the doc of bootstrapAuthenticationRequest more accurate" am: 14d654f998

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f906612bfe94da792139601dd7ce9d2280f4d67
This commit is contained in:
Hui Wang
2021-03-12 18:32:33 +00:00
committed by Automerger Merge Worker
parent fa59a51450 14d654f998
commit d783f90b6d
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -14720,13 +14720,17 @@ public class TelephonyManager {
* </ul> * </ul>
* @param appType icc application type, like {@link #APPTYPE_USIM} or {@link * @param appType icc application type, like {@link #APPTYPE_USIM} or {@link
* #APPTYPE_ISIM} or {@link#APPTYPE_UNKNOWN} * #APPTYPE_ISIM} or {@link#APPTYPE_UNKNOWN}
* @param nafId Network Application Function(NAF) fully qualified domain name and * @param nafId A URI to specify Network Application Function(NAF) fully qualified domain
* the selected GBA mode. It shall contain two parts delimited by "@" sign. The first * name (FQDN) and the selected GBA mode. The authority of the URI must contain two parts
* part is the constant string "3GPP-bootstrapping" (GBA_ME), * 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), * "3GPP-bootstrapping-uicc" (GBA_ U), or "3GPP-bootstrapping-digest" (GBA_Digest).
* and the latter part shall be the FQDN of the NAF (e.g. * The second part shall be the FQDN of the NAF. The scheme of the URI is not actually used
* "3GPP-bootstrapping@naf1.operator.com" or "3GPP-bootstrapping-uicc@naf1.operator.com", * for the authentication, which may be set the same as the resource that the application is
* or "3GPP-bootstrapping-digest@naf1.operator.com"). * 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 * @param securityProtocol Security protocol identifier between UE and NAF.  See
* 3GPP TS 33.220 Annex H. Application can use * 3GPP TS 33.220 Annex H. Application can use
   * {@link UaSecurityProtocolIdentifier#createDefaultUaSpId},    * {@link UaSecurityProtocolIdentifier#createDefaultUaSpId},