| commit | 7e507c7cd5633fe9d4a08dfba128682105260747 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Tue Jul 26 19:32:58 2016 +0000 |
| committer | Alan Viverette <alanv@google.com> | Tue Jul 26 19:32:58 2016 +0000 |
| tree | 74afecfd4a737b747a552dd8e360bedbc701a7a4 | |
| parent | 34c4d9da0433a4eab34b3cee8038c9ec6dca2ac1 [diff] |
Revert "Add @SafeVarargs to ActivityOptionsCompat to match framework version" This reverts commit 34c4d9da0433a4eab34b3cee8038c9ec6dca2ac1. Change-Id: I09316bb0c6c3df7c9a7131b4858803559bb47e19
diff --git a/compat/java/android/support/v4/app/ActivityOptionsCompat.java b/compat/java/android/support/v4/app/ActivityOptionsCompat.java index b5585a2..692b202 100644 --- a/compat/java/android/support/v4/app/ActivityOptionsCompat.java +++ b/compat/java/android/support/v4/app/ActivityOptionsCompat.java
@@ -240,7 +240,6 @@ * @return Returns a new ActivityOptions object that you can use to * supply these options as the options Bundle when starting an activity. */ - @SafeVarargs public static ActivityOptionsCompat makeSceneTransitionAnimation(Activity activity, Pair<View, String>... sharedElements) { if (Build.VERSION.SDK_INT >= 21) {