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

Merge "hotspot2: expose string constants for cert type and auth methods"

Browse Source
This commit is contained in:
Treehugger Robot
2017-03-02 22:11:00 +00:00
committed by Gerrit Code Review
parent b8648ae07a f8dbd216c8
commit 603fb2ef56
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wifi/java/android/net/wifi/hotspot2/pps/Credential.java
View File

@@ -121,13 +121,23 @@ public final class Credential implements Parcelable {
*/
private static final int MAX_PASSWORD_BYTES = 255;
/**
* Supported authentication methods.
* @hide
*/
public static final String AUTH_METHOD_PAP = "PAP";
/** @hide */
public static final String AUTH_METHOD_MSCHAP = "MS-CHAP";
/** @hide */
public static final String AUTH_METHOD_MSCHAPV2 = "MS-CHAP-V2";
/**
* Supported Non-EAP inner methods. Refer to
* Credential/UsernamePassword/EAPMethod/InnerEAPType in Hotspot 2.0 Release 2 Technical
* Specification Section 9.1 for more info.
*/
private static final Set<String> SUPPORTED_AUTH =
new HashSet<String>(Arrays.asList("PAP", "CHAP", "MS-CHAP", "MS-CHAP-V2"));
private static final Set<String> SUPPORTED_AUTH = new HashSet<String>(
Arrays.asList(AUTH_METHOD_PAP, AUTH_METHOD_MSCHAP, AUTH_METHOD_MSCHAPV2));
/**
* Username of the credential.
@@ -348,8 +358,9 @@ public final class Credential implements Parcelable {
public static final class CertificateCredential implements Parcelable {
/**
* Supported certificate types.
* @hide
*/
private static final String CERT_TYPE_X509V3 = "x509v3";
public static final String CERT_TYPE_X509V3 = "x509v3";
/**
* Certificate SHA-256 fingerprint length.