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

Fix compiler warning in Activity.java.

Browse Source 
Otherwise appears in frameworks/base build output.

Change-Id: Id4ee4f01ba8026b2629f4c3b30c7152d9bdcfc64
This commit is contained in:
John Spurlock
2014-03-10 09:56:00 -04:00
parent 863d691efa
commit fc558d56c2
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.Transition;
import android.transition.TransitionManager; import android.transition.TransitionManager;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Pair;
import android.util.SuperNotCalledException; import android.util.SuperNotCalledException;
import com.android.internal.app.ActionBarImpl; import com.android.internal.app.ActionBarImpl;
import com.android.internal.policy.PolicyManager; import com.android.internal.policy.PolicyManager;
@@ -3456,7 +3457,8 @@ public class Activity extends ContextThemeWrapper
public void startActivityForResult(Intent intent, int requestCode) { public void startActivityForResult(Intent intent, int requestCode) {
Bundle options = null; Bundle options = null;
if (mWindow.hasFeature(Window.FEATURE_CONTENT_TRANSITIONS)) { 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); startActivityForResult(intent, requestCode, options);
} }