Merge "Fix activity config tests in ActivityThreadTest"

        </activity>

        <activity android:name="android.app.activity.ActivityThreadTest$TestActivity"

            android:configChanges="screenLayout|screenSize|orientation|smallestScreenSize"

            android:supportsPictureInPicture="true"

            android:exported="true">

        </activity>

import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;

/**

 * Test for verifying {@link android.app.ActivityThread} class.

@RunWith(AndroidJUnit4.class)

@MediumTest

public class ActivityThreadTest {

    private static final int TIMEOUT_SEC = 10;

    // The first sequence number to try with. Use a large number to avoid conflicts with the first a

    // few sequence numbers the framework used to launch the test activity.

        transaction.addCallback(ActivityConfigurationChangeItem.obtain(activityConfigPortrait));

        appThread.scheduleTransaction(transaction);

        activity.mTestLatch.await();

        activity.mTestLatch.await(TIMEOUT_SEC, TimeUnit.SECONDS);

        activity.mConfigLatch.countDown();

        activity.mConfigLatch = null;

        // Wait until the main thread is performing the configuration change for the configuration

        // with sequence number BASE_SEQ + 1 before proceeding. This is to mimic the situation where

        // the activity takes very long time to process configuration changes.

        activity.mTestLatch.await();

        activity.mTestLatch.await(TIMEOUT_SEC, TimeUnit.SECONDS);

        config = new Configuration();

        config.seq = BASE_SEQ + 2;

                    mTestLatch.countDown();

                }

                try {

                    mConfigLatch.await();

                    mConfigLatch.await(TIMEOUT_SEC, TimeUnit.SECONDS);

                } catch (InterruptedException e) {

                    throw new IllegalStateException(e);

                }