commit 517383fcfe180b77ff95f5fd67d9a5d595481ea2
author Ian Rogers <irogers@google.com> Tue May 03 20:46:45 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 03 20:46:45 2016 +0000
tree 572a77510cbefafe41922abca486260b4b5394ba
parent fc4919f72c3268010113218d5b90041a1762e543
parent 7d927840750086a613244e94515fe75634b3af44

Merge "Work around a type inference change in javac"

src/com/android/camera/async/Futures2.java

diff --git a/src/com/android/camera/async/Futures2.java b/src/com/android/camera/async/Futures2.java
index 3b09b80..6669132 100644
--- a/src/com/android/camera/async/Futures2.java
+++ b/src/com/android/camera/async/Futures2.java
@@ -95,7 +95,7 @@
         // Futures.allAsList is used instead of Futures.successfulAsList because
         // allAsList will propagate the failures instead of null values to the
         // parameters of the supplied function.
-        ListenableFuture<List<Object>> result = Futures.allAsList(futures);
+        ListenableFuture<List<Object>> result = Futures.<Object>allAsList(futures);
         return Futures.transform(result, new AsyncFunction<List<Object>, TResult>() {
             @Override
             public ListenableFuture<TResult> apply(@Nullable List<Object> list) throws Exception {
@@ -140,7 +140,7 @@
         // Futures.allAsList is used instead of Futures.successfulAsList because
         // allAsList will propagate the failures instead of null values to the
         // parameters of the supplied function.
-        ListenableFuture<List<Object>> result = Futures.allAsList(futures);
+        ListenableFuture<List<Object>> result = Futures.<Object>allAsList(futures);
         return Futures.transform(result, new AsyncFunction<List<Object>, TResult>() {
             @Override
             public ListenableFuture<TResult> apply(@Nullable List<Object> list) throws Exception {