Merge "Refactor the nativePtr validation code to a method." (4a772fc4) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/text/MeasuredText.java

+13 −3

Original line number	Diff line number	Diff line
		@@ -232,9 +232,7 @@ public class MeasuredText {
		* @throws IllegalStateException if this Builder is reused.
		*/
		public MeasuredText build() {
		if (mNativePtr == 0) {
		throw new IllegalStateException("Builder can not be reused.");
		}
		ensureNativePtrNoReuse();
		try {
		long ptr = nBuildMeasuredText(mNativePtr, mText, mComputeHyphenation,
		mComputeLayout);
		@@ -247,6 +245,18 @@ public class MeasuredText {
		}
		}

		/**
		* Ensures {@link #mNativePtr} is not reused.
		*
		* <p/> This is a method by itself to help increase testability - eg. Robolectric might want
		* to override the validation behavior in test environment.
		*/
		private void ensureNativePtrNoReuse() {
		if (mNativePtr == 0) {
		throw new IllegalStateException("Builder can not be reused.");
		}
		}

		private static native /* Non Zero */ long nInitBuilder();

		/**