Snap for 5335706 from e4f7a8e5cadf96ce65a7796ae0f2841ba71c07b1 to qt-release (d4e2349e) · Commits · e / os / android_frameworks_base

Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -845,6 +845,7 @@ java_library_host {
		// specified on the build command line.
		java_library {
		name: "framework-atb-backward-compatibility",
		installable: true,
		srcs: [
		"core/java/android/content/pm/AndroidTestBaseUpdater.java",
		],
		@@ -1514,7 +1515,7 @@ droiddoc {
		],
		proofread_file: "ds-docs-proofrerad.txt",
		args: framework_docs_only_args +
		" -toroot / -samplegroup Admin " +
		" -toroot / -yamlV2 -metalavaApiSince -samplegroup Admin " +
		" -samplegroup Background " +
		" -samplegroup Connectivity " +
		" -samplegroup Content " +

apct-tests/perftests/core/src/android/graphics/perftests/RenderNodePerfTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ public class RenderNodePerfTest {
		final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		RenderNode node = RenderNode.create("LinearLayout", null);
		while (state.keepRunning()) {
		node.startRecording(100, 100);
		node.beginRecording(100, 100);
		node.endRecording();
		}
		}
		@@ -86,7 +86,7 @@ public class RenderNodePerfTest {

		while (state.keepRunning()) {
		for (int i = 0; i < nodes.length; i++) {
		nodes[i].startRecording(100, 100);
		nodes[i].beginRecording(100, 100);
		}
		for (int i = nodes.length - 1; i >= 0; i--) {
		nodes[i].endRecording();

apct-tests/perftests/core/src/android/text/StaticLayoutPerfTest.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -265,7 +265,7 @@ public class StaticLayoutPerfTest {
		state.pauseTiming();
		final StaticLayout layout =
		StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();
		final RecordingCanvas c = node.startRecording(1200, 200);
		final RecordingCanvas c = node.beginRecording(1200, 200);
		state.resumeTiming();

		layout.draw(c);
		@@ -282,7 +282,7 @@ public class StaticLayoutPerfTest {
		final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT);
		final StaticLayout layout =
		StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();
		final RecordingCanvas c = node.startRecording(1200, 200);
		final RecordingCanvas c = node.beginRecording(1200, 200);
		state.resumeTiming();

		layout.draw(c);
		@@ -299,7 +299,7 @@ public class StaticLayoutPerfTest {
		final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);
		final StaticLayout layout =
		StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();
		final RecordingCanvas c = node.startRecording(1200, 200);
		final RecordingCanvas c = node.beginRecording(1200, 200);
		state.resumeTiming();

		layout.draw(c);
		@@ -316,7 +316,7 @@ public class StaticLayoutPerfTest {
		final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT);
		final StaticLayout layout =
		StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();
		final RecordingCanvas c = node.startRecording(1200, 200);
		final RecordingCanvas c = node.beginRecording(1200, 200);
		Canvas.freeTextLayoutCaches();
		state.resumeTiming();

		@@ -334,7 +334,7 @@ public class StaticLayoutPerfTest {
		final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);
		final StaticLayout layout =
		StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();
		final RecordingCanvas c = node.startRecording(1200, 200);
		final RecordingCanvas c = node.beginRecording(1200, 200);
		Canvas.freeTextLayoutCaches();
		state.resumeTiming();

		@@ -353,7 +353,7 @@ public class StaticLayoutPerfTest {
		mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT), PAINT);
		final StaticLayout layout =
		StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();
		final RecordingCanvas c = node.startRecording(1200, 200);
		final RecordingCanvas c = node.beginRecording(1200, 200);
		state.resumeTiming();

		layout.draw(c);
		@@ -371,7 +371,7 @@ public class StaticLayoutPerfTest {
		mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT);
		final StaticLayout layout =
		StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();
		final RecordingCanvas c = node.startRecording(1200, 200);
		final RecordingCanvas c = node.beginRecording(1200, 200);
		state.resumeTiming();

		layout.draw(c);
		@@ -389,7 +389,7 @@ public class StaticLayoutPerfTest {
		mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT), PAINT);
		final StaticLayout layout =
		StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();
		final RecordingCanvas c = node.startRecording(1200, 200);
		final RecordingCanvas c = node.beginRecording(1200, 200);
		Canvas.freeTextLayoutCaches();
		state.resumeTiming();

		@@ -408,7 +408,7 @@ public class StaticLayoutPerfTest {
		mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT);
		final StaticLayout layout =
		StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();
		final RecordingCanvas c = node.startRecording(1200, 200);
		final RecordingCanvas c = node.beginRecording(1200, 200);
		Canvas.freeTextLayoutCaches();
		state.resumeTiming();

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -344,7 +344,7 @@ public class TextViewPrecomputedTextPerfTest {
		textView.setText(text);
		textView.measure(width, height);
		textView.layout(0, 0, textView.getMeasuredWidth(), textView.getMeasuredHeight());
		final RecordingCanvas c = node.startRecording(
		final RecordingCanvas c = node.beginRecording(
		textView.getMeasuredWidth(), textView.getMeasuredHeight());
		textView.nullLayouts();
		Canvas.freeTextLayoutCaches();
		@@ -371,7 +371,7 @@ public class TextViewPrecomputedTextPerfTest {
		textView.setText(text);
		textView.measure(width, height);
		textView.layout(0, 0, textView.getMeasuredWidth(), textView.getMeasuredHeight());
		final RecordingCanvas c = node.startRecording(
		final RecordingCanvas c = node.beginRecording(
		textView.getMeasuredWidth(), textView.getMeasuredHeight());
		textView.nullLayouts();
		Canvas.freeTextLayoutCaches();
		@@ -400,7 +400,7 @@ public class TextViewPrecomputedTextPerfTest {
		textView.setText(text);
		textView.measure(width, height);
		textView.layout(0, 0, textView.getMeasuredWidth(), textView.getMeasuredHeight());
		final RecordingCanvas c = node.startRecording(
		final RecordingCanvas c = node.beginRecording(
		textView.getMeasuredWidth(), textView.getMeasuredHeight());
		textView.nullLayouts();
		Canvas.freeTextLayoutCaches();
		@@ -430,7 +430,7 @@ public class TextViewPrecomputedTextPerfTest {
		textView.setText(text);
		textView.measure(width, height);
		textView.layout(0, 0, textView.getMeasuredWidth(), textView.getMeasuredHeight());
		final RecordingCanvas c = node.startRecording(
		final RecordingCanvas c = node.beginRecording(
		textView.getMeasuredWidth(), textView.getMeasuredHeight());
		textView.nullLayouts();
		Canvas.freeTextLayoutCaches();

api/current.txt

+19 −479

File changed.

Preview size limit exceeded, changes collapsed.