diff options
| author | John Spurlock <jspurlock@google.com> | 2014-03-10 09:56:00 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-03-10 09:56:00 -0400 |
| commit | fc558d56c2040220853d9912d765cfc535463689 (patch) | |
| tree | 09296b3dc29a10ee8b6aa9a629abbe482663bf85 | |
| parent | 863d691efaa92257246598a73af2f581fc991e0a (diff) | |
| download | frameworks_base-fc558d56c2040220853d9912d765cfc535463689.zip frameworks_base-fc558d56c2040220853d9912d765cfc535463689.tar.gz frameworks_base-fc558d56c2040220853d9912d765cfc535463689.tar.bz2 | |
Fix compiler warning in Activity.java.
Otherwise appears in frameworks/base build output.
Change-Id: Id4ee4f01ba8026b2629f4c3b30c7152d9bdcfc64
| -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); } |