Execute fragment transitions only for L and greater.
Bug 32455877
Test: gradlew connectedCheck in fragments/ on KK emulator.
Change-Id: If73c12a7b85dcee3428c714d9350df1d7c26ce96
diff --git a/fragment/java/android/support/v4/app/FragmentTransition.java b/fragment/java/android/support/v4/app/FragmentTransition.java
index bf73fda..9efd1bc 100644
--- a/fragment/java/android/support/v4/app/FragmentTransition.java
+++ b/fragment/java/android/support/v4/app/FragmentTransition.java
@@ -16,6 +16,7 @@
package android.support.v4.app;
import android.graphics.Rect;
+import android.os.Build;
import android.support.v4.util.ArrayMap;
import android.support.v4.view.ViewCompat;
import android.util.SparseArray;
@@ -80,7 +81,8 @@
static void startTransitions(FragmentManagerImpl fragmentManager,
ArrayList<BackStackRecord> records, ArrayList<Boolean> isRecordPop,
int startIndex, int endIndex, boolean isOptimized) {
- if (fragmentManager.mCurState < Fragment.CREATED) {
+ if (fragmentManager.mCurState < Fragment.CREATED
+ || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
return;
}
SparseArray<FragmentContainerTransition> transitioningFragments =
diff --git a/fragment/tests/java/android/support/v4/app/FragmentTransitionTest.java b/fragment/tests/java/android/support/v4/app/FragmentTransitionTest.java
index b9901c0..bc8e9e1 100644
--- a/fragment/tests/java/android/support/v4/app/FragmentTransitionTest.java
+++ b/fragment/tests/java/android/support/v4/app/FragmentTransitionTest.java
@@ -25,9 +25,11 @@
import android.app.Instrumentation;
import android.graphics.Rect;
+import android.os.Build;
import android.support.fragment.test.R;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
+import android.support.test.filters.SdkSuppress;
import android.support.test.rule.ActivityTestRule;
import android.support.v4.app.test.FragmentTestActivity;
import android.transition.TransitionSet;
@@ -46,6 +48,7 @@
@MediumTest
@RunWith(Parameterized.class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)
public class FragmentTransitionTest {
private final boolean mOptimize;
diff --git a/fragment/tests/java/android/support/v4/app/PostponedTransitionTest.java b/fragment/tests/java/android/support/v4/app/PostponedTransitionTest.java
index 854fd11..b20298d 100644
--- a/fragment/tests/java/android/support/v4/app/PostponedTransitionTest.java
+++ b/fragment/tests/java/android/support/v4/app/PostponedTransitionTest.java
@@ -22,11 +22,13 @@
import static org.junit.Assert.assertTrue;
import android.app.Instrumentation;
+import android.os.Build;
import android.os.Bundle;
import android.os.Parcelable;
import android.support.fragment.test.R;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
+import android.support.test.filters.SdkSuppress;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.support.v4.app.test.FragmentTestActivity;
@@ -42,6 +44,7 @@
@MediumTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)
public class PostponedTransitionTest {
@Rule
public ActivityTestRule<FragmentTestActivity> mActivityRule =