diff options
| author | Nate Fischer <ntfschr@google.com> | 2017-09-08 17:02:00 -0700 |
|---|---|---|
| committer | Nate Fischer <ntfschr@google.com> | 2017-09-21 18:34:43 -0700 |
| commit | 3442c74d2ce220a2d104a5717994bbaf09a9f02d (patch) | |
| tree | c4ba9c316a916dfd4ccd267b30e36164cde25467 /core/java/android/webkit/ClientCertRequest.java | |
| parent | ff499e4b0818eda3470c388fa34400ce3fe7f8a9 (diff) | |
WebView: add @Nullable and @NonNull annotations
This adds @Nullable and @NonNull annotations where the docs previously
stated this. This change should be safe, since we already disallowed
null values for the @NonNull parameters via documentation.
I verified that documentation changes for APIs which previously did not
mention null-ness in @param or @return Javadocs (if the API already
mentioned it in these spots, then DroidDoc prefers the hand-written
description).
This also fixes various lint errors.
Bug: 65465498
Test: make update-api and manually verify docs
Change-Id: I4751508d0e72be8ddfc3d6b601db8c307c9df60e
Diffstat (limited to 'core/java/android/webkit/ClientCertRequest.java')
| -rw-r--r-- | core/java/android/webkit/ClientCertRequest.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/webkit/ClientCertRequest.java b/core/java/android/webkit/ClientCertRequest.java index de17534b959b..0fc47f1ed0ff 100644 --- a/core/java/android/webkit/ClientCertRequest.java +++ b/core/java/android/webkit/ClientCertRequest.java @@ -16,6 +16,8 @@ package android.webkit; +import android.annotation.Nullable; + import java.security.Principal; import java.security.PrivateKey; import java.security.cert.X509Certificate; @@ -42,14 +44,16 @@ public abstract class ClientCertRequest { public ClientCertRequest() { } /** - * Returns the acceptable types of asymmetric keys (can be {@code null}). + * Returns the acceptable types of asymmetric keys. */ + @Nullable public abstract String[] getKeyTypes(); /** * Returns the acceptable certificate issuers for the certificate - * matching the private key (can be {@code null}). + * matching the private key. */ + @Nullable public abstract Principal[] getPrincipals(); /** |