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

Commit 223531d8 authored by Selim Gurun's avatar Selim Gurun Committed by Android (Google) Code Review
Browse files

Merge "Add the system apis for token binding"

parents 66d96977 a5171370

api/system-current.txt

+13 −0
Original line number Diff line number Diff line
@@ -46528,6 +46528,18 @@ package android.webkit { 
    method public void proceed();

  }













  public abstract class TokenBindingService {













    ctor public TokenBindingService();













    method public abstract void deleteAllKeys(android.webkit.ValueCallback<java.lang.Boolean>);













    method public abstract void deleteKey(android.net.Uri, android.webkit.ValueCallback<java.lang.Boolean>);













    method public abstract void enableTokenBinding();













    method public static android.webkit.TokenBindingService getInstance();













    method public abstract void getKey(android.net.Uri, java.lang.String, android.webkit.ValueCallback<java.security.KeyPair>);













    field public static final java.lang.String KEY_ALGORITHM_ECDSAP256 = "ECDSAP256";













    field public static final java.lang.String KEY_ALGORITHM_RSA2048_PKCS_1_5 = "RSA2048_PKCS_1.5";













    field public static final java.lang.String KEY_ALGORITHM_RSA2048_PSS = "RSA2048PSS";













  }



























  public final class URLUtil {















    ctor public URLUtil();















    method public static java.lang.String composeSearchUrl(java.lang.String, java.lang.String, java.lang.String);










@@ -47150,6 +47162,7 @@ package android.webkit {













    method public abstract android.webkit.CookieManager getCookieManager();















    method public abstract android.webkit.GeolocationPermissions getGeolocationPermissions();















    method public abstract android.webkit.WebViewFactoryProvider.Statics getStatics();













    method public abstract android.webkit.TokenBindingService getTokenBindingService();















    method public abstract android.webkit.WebIconDatabase getWebIconDatabase();















    method public abstract android.webkit.WebStorage getWebStorage();















    method public abstract android.webkit.WebViewDatabase getWebViewDatabase(android.content.Context);

























core/java/android/webkit/TokenBindingService.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -30,6 +30,7 @@ import java.security.spec.AlgorithmParameterSpec;













 * attached to the View hierarchy.















 * @hide















 */













@SystemApi















public abstract class TokenBindingService {































    public static final String KEY_ALGORITHM_RSA2048_PKCS_1_5 = "RSA2048_PKCS_1.5";

































core/java/android/webkit/WebViewFactoryProvider.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -107,7 +107,6 @@ public interface WebViewFactoryProvider {













     * implementation must return the same instance on subsequent calls.















     *















     * @return the TokenBindingService instance













     * @hide















     */















    TokenBindingService getTokenBindingService();