6 files changed, 91 insertions, 3 deletions
diff --git a/concurrent/futures/api/1.0.0-alpha02.txt b/concurrent/futures/api/1.0.0-alpha02.txt
index cee1ebb2bb1..514cda52cc5 100644
--- a/concurrent/futures/api/1.0.0-alpha02.txt
+++ b/concurrent/futures/api/1.0.0-alpha02.txt
@@ -19,7 +19,7 @@ package androidx.concurrent.futures {
   }
 
   public final class ResolvableFuture<V> extends androidx.concurrent.futures.AbstractResolvableFuture<V> {
-    method public static <V> androidx.concurrent.futures.ResolvableFuture<V>! create();
+    method public static <V> androidx.concurrent.futures.ResolvableFuture<V!>! create();
     method public boolean set(V?);
     method public boolean setException(Throwable!);
     method public boolean setFuture(com.google.common.util.concurrent.ListenableFuture<? extends V>!);
diff --git a/concurrent/futures/api/1.0.0-alpha03.txt b/concurrent/futures/api/1.0.0-alpha03.txt
index beb76bd8cab..ff0231c89ee 100644
--- a/concurrent/futures/api/1.0.0-alpha03.txt
+++ b/concurrent/futures/api/1.0.0-alpha03.txt
@@ -1,6 +1,23 @@
 // Signature format: 3.0
 package androidx.concurrent.futures {
 
+  public abstract class AbstractResolvableFuture<V> implements com.google.common.util.concurrent.ListenableFuture<V> {
+    ctor protected AbstractResolvableFuture();
+    method public final void addListener(Runnable!, java.util.concurrent.Executor!);
+    method protected void afterDone();
+    method public final boolean cancel(boolean);
+    method public final V! get(long, java.util.concurrent.TimeUnit!) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+    method public final V! get() throws java.util.concurrent.ExecutionException, java.lang.InterruptedException;
+    method protected void interruptTask();
+    method public final boolean isCancelled();
+    method public final boolean isDone();
+    method protected String? pendingToString();
+    method protected boolean set(V?);
+    method protected boolean setException(Throwable!);
+    method protected boolean setFuture(com.google.common.util.concurrent.ListenableFuture<? extends V>!);
+    method protected final boolean wasInterrupted();
+  }
+
   public final class CallbackToFutureAdapter {
     method public static <T> com.google.common.util.concurrent.ListenableFuture<T!> getFuture(androidx.concurrent.futures.CallbackToFutureAdapter.Resolver<T!>);
   }
@@ -17,5 +34,12 @@ package androidx.concurrent.futures {
     method public Object? attachCompleter(androidx.concurrent.futures.CallbackToFutureAdapter.Completer<T!>) throws java.lang.Exception;
   }
 
+  public final class ResolvableFuture<V> extends androidx.concurrent.futures.AbstractResolvableFuture<V> {
+    method public static <V> androidx.concurrent.futures.ResolvableFuture<V!>! create();
+    method public boolean set(V?);
+    method public boolean setException(Throwable!);
+    method public boolean setFuture(com.google.common.util.concurrent.ListenableFuture<? extends V>!);
+  }
+
 }
 
diff --git a/concurrent/futures/api/restricted_1.0.0-alpha03.txt b/concurrent/futures/api/restricted_1.0.0-alpha03.txt
index 1c05c569c2a..ff0231c89ee 100644
--- a/concurrent/futures/api/restricted_1.0.0-alpha03.txt
+++ b/concurrent/futures/api/restricted_1.0.0-alpha03.txt
@@ -1,7 +1,7 @@
 // Signature format: 3.0
 package androidx.concurrent.futures {
 
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public abstract class AbstractResolvableFuture<V> implements com.google.common.util.concurrent.ListenableFuture<V> {
+  public abstract class AbstractResolvableFuture<V> implements com.google.common.util.concurrent.ListenableFuture<V> {
     ctor protected AbstractResolvableFuture();
     method public final void addListener(Runnable!, java.util.concurrent.Executor!);
     method protected void afterDone();
@@ -18,7 +18,23 @@ package androidx.concurrent.futures {
     method protected final boolean wasInterrupted();
   }
 
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class ResolvableFuture<V> extends androidx.concurrent.futures.AbstractResolvableFuture<V> {
+  public final class CallbackToFutureAdapter {
+    method public static <T> com.google.common.util.concurrent.ListenableFuture<T!> getFuture(androidx.concurrent.futures.CallbackToFutureAdapter.Resolver<T!>);
+  }
+
+  public static final class CallbackToFutureAdapter.Completer<T> {
+    method public void addCancellationListener(Runnable, java.util.concurrent.Executor);
+    method protected void finalize();
+    method public boolean set(T!);
+    method public boolean setCancelled();
+    method public boolean setException(Throwable);
+  }
+
+  public static interface CallbackToFutureAdapter.Resolver<T> {
+    method public Object? attachCompleter(androidx.concurrent.futures.CallbackToFutureAdapter.Completer<T!>) throws java.lang.Exception;
+  }
+
+  public final class ResolvableFuture<V> extends androidx.concurrent.futures.AbstractResolvableFuture<V> {
     method public static <V> androidx.concurrent.futures.ResolvableFuture<V!>! create();
     method public boolean set(V?);
     method public boolean setException(Throwable!);
diff --git a/concurrent/futures/api/restricted_1.0.0-beta01.txt b/concurrent/futures/api/restricted_1.0.0-beta01.txt
index 1c05c569c2a..6dabf0b94e3 100644
--- a/concurrent/futures/api/restricted_1.0.0-beta01.txt
+++ b/concurrent/futures/api/restricted_1.0.0-beta01.txt
@@ -18,6 +18,22 @@ package androidx.concurrent.futures {
     method protected final boolean wasInterrupted();
   }
 
+  public final class CallbackToFutureAdapter {
+    method public static <T> com.google.common.util.concurrent.ListenableFuture<T!> getFuture(androidx.concurrent.futures.CallbackToFutureAdapter.Resolver<T!>);
+  }
+
+  public static final class CallbackToFutureAdapter.Completer<T> {
+    method public void addCancellationListener(Runnable, java.util.concurrent.Executor);
+    method protected void finalize();
+    method public boolean set(T!);
+    method public boolean setCancelled();
+    method public boolean setException(Throwable);
+  }
+
+  public static interface CallbackToFutureAdapter.Resolver<T> {
+    method public Object? attachCompleter(androidx.concurrent.futures.CallbackToFutureAdapter.Completer<T!>) throws java.lang.Exception;
+  }
+
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class ResolvableFuture<V> extends androidx.concurrent.futures.AbstractResolvableFuture<V> {
     method public static <V> androidx.concurrent.futures.ResolvableFuture<V!>! create();
     method public boolean set(V?);
diff --git a/concurrent/futures/api/restricted_1.0.0-beta02.txt b/concurrent/futures/api/restricted_1.0.0-beta02.txt
index 1c05c569c2a..6dabf0b94e3 100644
--- a/concurrent/futures/api/restricted_1.0.0-beta02.txt
+++ b/concurrent/futures/api/restricted_1.0.0-beta02.txt
@@ -18,6 +18,22 @@ package androidx.concurrent.futures {
     method protected final boolean wasInterrupted();
   }
 
+  public final class CallbackToFutureAdapter {
+    method public static <T> com.google.common.util.concurrent.ListenableFuture<T!> getFuture(androidx.concurrent.futures.CallbackToFutureAdapter.Resolver<T!>);
+  }
+
+  public static final class CallbackToFutureAdapter.Completer<T> {
+    method public void addCancellationListener(Runnable, java.util.concurrent.Executor);
+    method protected void finalize();
+    method public boolean set(T!);
+    method public boolean setCancelled();
+    method public boolean setException(Throwable);
+  }
+
+  public static interface CallbackToFutureAdapter.Resolver<T> {
+    method public Object? attachCompleter(androidx.concurrent.futures.CallbackToFutureAdapter.Completer<T!>) throws java.lang.Exception;
+  }
+
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class ResolvableFuture<V> extends androidx.concurrent.futures.AbstractResolvableFuture<V> {
     method public static <V> androidx.concurrent.futures.ResolvableFuture<V!>! create();
     method public boolean set(V?);
diff --git a/concurrent/futures/api/restricted_current.txt b/concurrent/futures/api/restricted_current.txt
index 1c05c569c2a..6dabf0b94e3 100644
--- a/concurrent/futures/api/restricted_current.txt
+++ b/concurrent/futures/api/restricted_current.txt
@@ -18,6 +18,22 @@ package androidx.concurrent.futures {
     method protected final boolean wasInterrupted();
   }
 
+  public final class CallbackToFutureAdapter {
+    method public static <T> com.google.common.util.concurrent.ListenableFuture<T!> getFuture(androidx.concurrent.futures.CallbackToFutureAdapter.Resolver<T!>);
+  }
+
+  public static final class CallbackToFutureAdapter.Completer<T> {
+    method public void addCancellationListener(Runnable, java.util.concurrent.Executor);
+    method protected void finalize();
+    method public boolean set(T!);
+    method public boolean setCancelled();
+    method public boolean setException(Throwable);
+  }
+
+  public static interface CallbackToFutureAdapter.Resolver<T> {
+    method public Object? attachCompleter(androidx.concurrent.futures.CallbackToFutureAdapter.Completer<T!>) throws java.lang.Exception;
+  }
+
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class ResolvableFuture<V> extends androidx.concurrent.futures.AbstractResolvableFuture<V> {
     method public static <V> androidx.concurrent.futures.ResolvableFuture<V!>! create();
     method public boolean set(V?);