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

Merge "WifiEnterpriseConfig: Mark as getters/setters @NonNull"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-23 17:45:40 +00:00
committed by Android (Google) Code Review
parent 12ce8338cc 0f9e4b6c3c
commit 21460c4ece
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/system-current.txt
View File

@@ -7507,12 +7507,12 @@ package android.net.wifi {
method @NonNull public String getCaPath();
method @NonNull public String getClientCertificateAlias();
method public int getOcsp();
method @Nullable public String getWapiCertSuite();
method @NonNull public String getWapiCertSuite();
method public void setCaCertificateAliases(@Nullable String[]);
method public void setCaPath(@Nullable String);
method public void setClientCertificateAlias(@Nullable String);
method public void setCaPath(@NonNull String);
method public void setClientCertificateAlias(@NonNull String);
method public void setOcsp(int);
method public void setWapiCertSuite(@Nullable String);
method public void setWapiCertSuite(@NonNull String);
field public static final int OCSP_NONE = 0; // 0x0
field public static final int OCSP_REQUEST_CERT_STATUS = 1; // 0x1
field public static final int OCSP_REQUIRE_ALL_NON_TRUSTED_CERTS_STATUS = 3; // 0x3

14
wifi/java/android/net/wifi/WifiEnterpriseConfig.java
View File

@@ -856,11 +856,11 @@ public class WifiEnterpriseConfig implements Parcelable {
* like /etc/ssl/certs. If configured, these certificates are added to the
* list of trusted CAs. ca_cert may also be included in that case, but it is
* not required.
* @param path The path for CA certificate files, or null/empty string to clear.
* @param path The path for CA certificate files, or empty string to clear.
* @hide
*/
@SystemApi
public void setCaPath(@Nullable String path) {
public void setCaPath(@NonNull String path) {
setFieldValue(CA_PATH_KEY, path);
}
@@ -881,11 +881,11 @@ public class WifiEnterpriseConfig implements Parcelable {
* <p> See the {@link android.security.KeyChain} for details on installing or choosing
* a certificate
* </p>
* @param alias identifies the certificate, or null/empty string to clear.
* @param alias identifies the certificate, or empty string to clear.
* @hide
*/
@SystemApi
public void setClientCertificateAlias(@Nullable String alias) {
public void setClientCertificateAlias(@NonNull String alias) {
setFieldValue(CLIENT_CERT_KEY, alias, CLIENT_CERT_PREFIX);
setFieldValue(PRIVATE_KEY_ID_KEY, alias, USER_PRIVATE_KEY);
// Also, set engine parameters
@@ -1360,11 +1360,11 @@ public class WifiEnterpriseConfig implements Parcelable {
* If this field is not specified, WAPI-CERT uses ASU ID from WAI packet
* as the certificate suite name automatically.
*
* @param wapiCertSuite The name for WAPI certificate suite, or null/empty string to clear.
* @param wapiCertSuite The name for WAPI certificate suite, or empty string to clear.
* @hide
*/
@SystemApi
public void setWapiCertSuite(@Nullable String wapiCertSuite) {
public void setWapiCertSuite(@NonNull String wapiCertSuite) {
setFieldValue(WAPI_CERT_SUITE_KEY, wapiCertSuite);
}
@@ -1373,7 +1373,7 @@ public class WifiEnterpriseConfig implements Parcelable {
* @return the certificate suite name
* @hide
*/
@Nullable
@NonNull
@SystemApi
public String getWapiCertSuite() {
return getFieldValue(WAPI_CERT_SUITE_KEY);