Merge upstream into cm-11.0

Change-Id: I304cfea73e62d7a78d4eb1e0a766d6bb1666476f

1 files changed, 12 insertions, 1 deletions

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index dd33d54..11f5df3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -14,6 +14,17 @@ public class SimpleFuture<T> extends SimpleCancellable implements DependentFutur
     boolean silent;
     FutureCallback<T> callback;
 
+    public SimpleFuture() {
+    }
+
+    public SimpleFuture(T value) {
+        setComplete(value);
+    }
+
+    public SimpleFuture(Exception e) {
+        setComplete(e);
+    }
+
     @Override
     public boolean cancel(boolean mayInterruptIfRunning) {
         return cancel();
@@ -166,7 +177,7 @@ public class SimpleFuture<T> extends SimpleCancellable implements DependentFutur
     }
 
     @Override
-    public <C extends FutureCallback<T>> C then(C callback) {
+    public final <C extends FutureCallback<T>> C then(C callback) {
         if (callback instanceof DependentCancellable)
             ((DependentCancellable)callback).setParent(this);
         setCallback(callback);