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

Merge "Add @Nullable to new method"

Browse Source
This commit is contained in:
Treehugger Robot
2019-03-04 11:43:48 +00:00
committed by Gerrit Code Review
parent 69ae441fa1 882eb1867c
commit 70c0efdd86
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -27890,7 +27890,7 @@ package android.net.http {
method public java.util.Date getValidNotAfterDate(); method public java.util.Date getValidNotAfterDate();
method @Deprecated public String getValidNotBefore(); method @Deprecated public String getValidNotBefore();
method public java.util.Date getValidNotBeforeDate(); method public java.util.Date getValidNotBeforeDate();
method public java.security.cert.X509Certificate getX509Certificate(); method @Nullable public java.security.cert.X509Certificate getX509Certificate();
method public static android.net.http.SslCertificate restoreState(android.os.Bundle); method public static android.net.http.SslCertificate restoreState(android.os.Bundle);
method public static android.os.Bundle saveState(android.net.http.SslCertificate); method public static android.os.Bundle saveState(android.net.http.SslCertificate);
} }

3
core/java/android/net/http/SslCertificate.java
View File

@@ -16,6 +16,7 @@
package android.net.http; package android.net.http;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
@@ -252,7 +253,7 @@ public class SslCertificate {
* @return The {@code X509Certificate} used to create this {@code SslCertificate} or * @return The {@code X509Certificate} used to create this {@code SslCertificate} or
* {@code null} if no certificate was provided. * {@code null} if no certificate was provided.
*/ */
public X509Certificate getX509Certificate() { public @Nullable X509Certificate getX509Certificate() {
return mX509Certificate; return mX509Certificate;
} }