diff options
| author | John Spurlock <jspurlock@google.com> | 2014-03-10 07:59:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-10 07:59:16 -0700 |
| commit | f7fcaa89beb5e0d9d069f48cd44f515c09b69c5a (patch) | |
| tree | 9f90960b74c88bb26573242b72326d587e74f474 | |
| parent | 3692f24667fad1e55caacae9a0ab571761f72830 (diff) | |
| parent | fc558d56c2040220853d9912d765cfc535463689 (diff) | |
| download | frameworks_base-f7fcaa89beb5e0d9d069f48cd44f515c09b69c5a.zip frameworks_base-f7fcaa89beb5e0d9d069f48cd44f515c09b69c5a.tar.gz frameworks_base-f7fcaa89beb5e0d9d069f48cd44f515c09b69c5a.tar.bz2 | |
am fc558d56: Fix compiler warning in Activity.java.
* commit 'fc558d56c2040220853d9912d765cfc535463689':
Fix compiler warning in Activity.java.
| -rw-r--r-- | core/java/android/app/Activity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index af4a362..287c463 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -21,6 +21,7 @@ import android.transition.Scene; import android.transition.Transition; import android.transition.TransitionManager; import android.util.ArrayMap; +import android.util.Pair; import android.util.SuperNotCalledException; import com.android.internal.app.ActionBarImpl; import com.android.internal.policy.PolicyManager; @@ -3456,7 +3457,8 @@ public class Activity extends ContextThemeWrapper public void startActivityForResult(Intent intent, int requestCode) { Bundle options = null; if (mWindow.hasFeature(Window.FEATURE_CONTENT_TRANSITIONS)) { - options = ActivityOptions.makeSceneTransitionAnimation(null).toBundle(); + final Pair<View, String>[] noSharedElements = null; + options = ActivityOptions.makeSceneTransitionAnimation(noSharedElements).toBundle(); } startActivityForResult(intent, requestCode, options); } |