commit fc558d56c2040220853d9912d765cfc535463689
author John Spurlock <jspurlock@google.com> Mon Mar 10 09:56:00 2014 -0400
committer John Spurlock <jspurlock@google.com> Mon Mar 10 09:56:00 2014 -0400
tree 09296b3dc29a10ee8b6aa9a629abbe482663bf85
parent 863d691efaa92257246598a73af2f581fc991e0a

Fix compiler warning in Activity.java.

Otherwise appears in frameworks/base build output.

Change-Id: Id4ee4f01ba8026b2629f4c3b30c7152d9bdcfc64

core/java/android/app/Activity.java

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.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 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);
     }