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

Commit fc0ee229 authored by Sergio Giro's avatar Sergio Giro Committed by android-build-merger
Browse files

Merge "java.security.Provider: port to jdk8u60 (second part)" am: 84457029 

am: 81749ef4

Change-Id: I6c3b6601f061ee644a9cbcc3f1bb2b8aefcd103d
parents 4f107811 81749ef4

api/current.txt

+9 −0
Original line number Diff line number Diff line
@@ -55200,16 +55200,25 @@ package java.security { 














  public abstract class Provider extends java.util.Properties {















    ctor protected Provider(java.lang.String, double, java.lang.String);













    method public synchronized java.lang.Object compute(java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>);













    method public synchronized java.lang.Object computeIfAbsent(java.lang.Object, java.util.function.Function<? super java.lang.Object, ? extends java.lang.Object>);













    method public synchronized java.lang.Object computeIfPresent(java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>);















    method public synchronized void forEach(java.util.function.BiConsumer<? super java.lang.Object, ? super java.lang.Object>);















    method public java.lang.String getInfo();















    method public java.lang.String getName();













    method public synchronized java.lang.Object getOrDefault(java.lang.Object, java.lang.Object);















    method public synchronized java.security.Provider.Service getService(java.lang.String, java.lang.String);















    method public synchronized java.util.Set<java.security.Provider.Service> getServices();















    method public double getVersion();













    method public synchronized java.lang.Object merge(java.lang.Object, java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>);















    method public synchronized java.lang.Object put(java.lang.Object, java.lang.Object);















    method public synchronized void putAll(java.util.Map<?, ?>);













    method public synchronized java.lang.Object putIfAbsent(java.lang.Object, java.lang.Object);















    method protected synchronized void putService(java.security.Provider.Service);















    method protected synchronized void removeService(java.security.Provider.Service);













    method public synchronized boolean replace(java.lang.Object, java.lang.Object, java.lang.Object);













    method public synchronized java.lang.Object replace(java.lang.Object, java.lang.Object);













    method public synchronized void replaceAll(java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>);















  }





























  public static class Provider.Service {

























api/system-current.txt



+9
−0




























Original line number
Diff line number
Diff line








@@ -58557,16 +58557,25 @@ package java.security {



























  public abstract class Provider extends java.util.Properties {















    ctor protected Provider(java.lang.String, double, java.lang.String);













    method public synchronized java.lang.Object compute(java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>);













    method public synchronized java.lang.Object computeIfAbsent(java.lang.Object, java.util.function.Function<? super java.lang.Object, ? extends java.lang.Object>);













    method public synchronized java.lang.Object computeIfPresent(java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>);















    method public synchronized void forEach(java.util.function.BiConsumer<? super java.lang.Object, ? super java.lang.Object>);















    method public java.lang.String getInfo();















    method public java.lang.String getName();













    method public synchronized java.lang.Object getOrDefault(java.lang.Object, java.lang.Object);















    method public synchronized java.security.Provider.Service getService(java.lang.String, java.lang.String);















    method public synchronized java.util.Set<java.security.Provider.Service> getServices();















    method public double getVersion();













    method public synchronized java.lang.Object merge(java.lang.Object, java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>);















    method public synchronized java.lang.Object put(java.lang.Object, java.lang.Object);















    method public synchronized void putAll(java.util.Map<?, ?>);













    method public synchronized java.lang.Object putIfAbsent(java.lang.Object, java.lang.Object);















    method protected synchronized void putService(java.security.Provider.Service);















    method protected synchronized void removeService(java.security.Provider.Service);













    method public synchronized boolean replace(java.lang.Object, java.lang.Object, java.lang.Object);













    method public synchronized java.lang.Object replace(java.lang.Object, java.lang.Object);













    method public synchronized void replaceAll(java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>);















  }





























  public static class Provider.Service {

























api/test-current.txt



+9
−0




























Original line number
Diff line number
Diff line








@@ -55280,16 +55280,25 @@ package java.security {



























  public abstract class Provider extends java.util.Properties {















    ctor protected Provider(java.lang.String, double, java.lang.String);













    method public synchronized java.lang.Object compute(java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>);













    method public synchronized java.lang.Object computeIfAbsent(java.lang.Object, java.util.function.Function<? super java.lang.Object, ? extends java.lang.Object>);













    method public synchronized java.lang.Object computeIfPresent(java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>);















    method public synchronized void forEach(java.util.function.BiConsumer<? super java.lang.Object, ? super java.lang.Object>);















    method public java.lang.String getInfo();















    method public java.lang.String getName();













    method public synchronized java.lang.Object getOrDefault(java.lang.Object, java.lang.Object);















    method public synchronized java.security.Provider.Service getService(java.lang.String, java.lang.String);















    method public synchronized java.util.Set<java.security.Provider.Service> getServices();















    method public double getVersion();













    method public synchronized java.lang.Object merge(java.lang.Object, java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>);















    method public synchronized java.lang.Object put(java.lang.Object, java.lang.Object);















    method public synchronized void putAll(java.util.Map<?, ?>);













    method public synchronized java.lang.Object putIfAbsent(java.lang.Object, java.lang.Object);















    method protected synchronized void putService(java.security.Provider.Service);















    method protected synchronized void removeService(java.security.Provider.Service);













    method public synchronized boolean replace(java.lang.Object, java.lang.Object, java.lang.Object);













    method public synchronized java.lang.Object replace(java.lang.Object, java.lang.Object);













    method public synchronized void replaceAll(java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>);















  }





























  public static class Provider.Service {