| commit | 34c4d9da0433a4eab34b3cee8038c9ec6dca2ac1 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Tue Jul 26 14:52:47 2016 -0400 |
| committer | Alan Viverette <alanv@google.com> | Tue Jul 26 14:52:47 2016 -0400 |
| tree | 3b6bdf97177d00a8c61ccd5861a95cfaf4f4a7e5 | |
| parent | 1f4795fd437e3046587a29d344177a2becf3bea5 [diff] |
Add @SafeVarargs to ActivityOptionsCompat to match framework version Change-Id: Iacd7a93bdefbb268bc162721198f56eb61777fcf
diff --git a/compat/java/android/support/v4/app/ActivityOptionsCompat.java b/compat/java/android/support/v4/app/ActivityOptionsCompat.java index 692b202..b5585a2 100644 --- a/compat/java/android/support/v4/app/ActivityOptionsCompat.java +++ b/compat/java/android/support/v4/app/ActivityOptionsCompat.java
@@ -240,6 +240,7 @@ * @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) {