Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fc558d56: Fix compiler warning in Activity.java.

Browse Source 
* commit 'fc558d56c2040220853d9912d765cfc535463689':
  Fix compiler warning in Activity.java.
This commit is contained in:
John Spurlock
2014-03-10 07:59:16 -07:00
committed by Android Git Automerger
parent 3692f24667 fc558d56c2
commit f7fcaa89be
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/Activity.java
View File

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