Merge "Fix test failure due to out of UI thread runnning." (cebb2882) · Commits · e / os / android_frameworks_base

apct-tests/perftests/core/src/android/widget/EditTextLongTextPerfTest.java

+15 −15

Original line number	Original line	Diff line number	Diff line
	@@ -41,7 +41,6 @@ import android.perftests.utils.PerfStatusReporter;
	import android.perftests.utils.StubActivity;		import android.perftests.utils.StubActivity;
	import android.support.test.filters.LargeTest;		import android.support.test.filters.LargeTest;
	import android.support.test.runner.AndroidJUnit4;		import android.support.test.runner.AndroidJUnit4;
	import android.support.test.annotation.UiThreadTest;
	import android.support.test.rule.ActivityTestRule;		import android.support.test.rule.ActivityTestRule;
	import android.support.test.InstrumentationRegistry;		import android.support.test.InstrumentationRegistry;

	@@ -106,8 +105,8 @@ public class EditTextLongTextPerfTest {
	}		}

	@Test		@Test
	@UiThreadTest		public void testEditText() throws Throwable {
	public void testEditText() {		mActivityRule.runOnUiThread(() -> {
	BenchmarkState state = mPerfStatusReporter.getBenchmarkState();		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
	final EditText editText = setupEditText();		final EditText editText = setupEditText();
	final KeyEvent keyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER);		final KeyEvent keyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER);
	@@ -121,5 +120,6 @@ public class EditTextLongTextPerfTest {
	editText.updateDisplayListIfDirty();		editText.updateDisplayListIfDirty();
	}		}
	}		}
			});
	}		}
	}		}