Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f15b8a04 authored by Adam Vartanian's avatar Adam Vartanian Committed by android-build-merger
Browse files

Merge "Add @Nullable to new method" am: 70c0efdd am: 2948be98 

am: a3437503

Change-Id: I743d3fae43073eebf1a9abecd45fe71456f4ab43
parents 5766681a a3437503

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -29402,7 +29402,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);

  }

core/java/android/net/http/SslCertificate.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

    }