Merge "Double check the layout test running on UI thread"

package android.widget;

import android.app.Activity;

import android.os.Looper;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.StubActivity;

import static android.view.View.MeasureSpec.AT_MOST;

import static android.view.View.MeasureSpec.EXACTLY;

import static android.view.View.MeasureSpec.UNSPECIFIED;

import static org.junit.Assert.assertTrue;

@LargeTest

@RunWith(Parameterized.class)

    @Test

    @UiThreadTest

    public void testLayoutPerf() {

        assertTrue("We should be running on the main thread",

                Looper.getMainLooper().getThread() == Thread.currentThread());

        assertTrue("We should be running on the main thread",

                Looper.myLooper() == Looper.getMainLooper());

        Activity activity = mActivityRule.getActivity();

        activity.setContentView(mLayoutId);