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

Merge "Add @Nullable to new method" am: 70c0efdd86

Browse Source 
am: 2948be98c2

Change-Id: I6f73879bd791af4ce2e0f6669a2d39f3648a5595
This commit is contained in:
Adam Vartanian
2019-03-04 04:10:20 -08:00
committed by android-build-merger
parent d6b2dc39ee 2948be98c2
commit a343750304
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

@@ -27888,7 +27888,7 @@ package android.net.http {
method public java.util.Date getValidNotAfterDate();
method @Deprecated public String getValidNotBefore();
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.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;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.os.Bundle;
@@ -252,7 +253,7 @@ public class SslCertificate {
* @return The {@code X509Certificate} used to create this {@code SslCertificate} or
* {@code null} if no certificate was provided.
*/
public X509Certificate getX509Certificate() {
public @Nullable X509Certificate getX509Certificate() {
return mX509Certificate;
}