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

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

Browse Source 
am: 81749ef47f

Change-Id: I6c3b6601f061ee644a9cbcc3f1bb2b8aefcd103d
This commit is contained in:
Sergio Giro
2016-09-08 12:32:42 +00:00
committed by android-build-merger
parent 4f107811e2 81749ef47f
commit fc0ee229bb
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/current.txt
View File

@@ -55200,16 +55200,25 @@ package java.security {
public abstract class Provider extends java.util.Properties { public abstract class Provider extends java.util.Properties {
ctor protected Provider(java.lang.String, double, java.lang.String); 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 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 getInfo();
method public java.lang.String getName(); 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.security.Provider.Service getService(java.lang.String, java.lang.String);
method public synchronized java.util.Set<java.security.Provider.Service> getServices(); method public synchronized java.util.Set<java.security.Provider.Service> getServices();
method public double getVersion(); 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 java.lang.Object put(java.lang.Object, java.lang.Object);
method public synchronized void putAll(java.util.Map<?, ?>); 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 putService(java.security.Provider.Service);
method protected synchronized void removeService(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 { public static class Provider.Service {

9
api/system-current.txt
View File

@@ -58557,16 +58557,25 @@ package java.security {
public abstract class Provider extends java.util.Properties { public abstract class Provider extends java.util.Properties {
ctor protected Provider(java.lang.String, double, java.lang.String); 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 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 getInfo();
method public java.lang.String getName(); 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.security.Provider.Service getService(java.lang.String, java.lang.String);
method public synchronized java.util.Set<java.security.Provider.Service> getServices(); method public synchronized java.util.Set<java.security.Provider.Service> getServices();
method public double getVersion(); 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 java.lang.Object put(java.lang.Object, java.lang.Object);
method public synchronized void putAll(java.util.Map<?, ?>); 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 putService(java.security.Provider.Service);
method protected synchronized void removeService(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 { public static class Provider.Service {

9
api/test-current.txt
View File

@@ -55280,16 +55280,25 @@ package java.security {
public abstract class Provider extends java.util.Properties { public abstract class Provider extends java.util.Properties {
ctor protected Provider(java.lang.String, double, java.lang.String); 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 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 getInfo();
method public java.lang.String getName(); 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.security.Provider.Service getService(java.lang.String, java.lang.String);
method public synchronized java.util.Set<java.security.Provider.Service> getServices(); method public synchronized java.util.Set<java.security.Provider.Service> getServices();
method public double getVersion(); 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 java.lang.Object put(java.lang.Object, java.lang.Object);
method public synchronized void putAll(java.util.Map<?, ?>); 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 putService(java.security.Provider.Service);
method protected synchronized void removeService(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 { public static class Provider.Service {