am 89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE] (15994863) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -253,8 +253,9 @@ public final class Bitmap_Delegate {
		}

		@LayoutlibDelegate
		/package/ static void nativeRecycle(int nativeBitmap) {
		/package/ static boolean nativeRecycle(int nativeBitmap) {
		sManager.removeJavaReferenceFor(nativeBitmap);
		return true;
		}

		@LayoutlibDelegate

+4 −4

Original line number	Diff line number	Diff line
		@@ -275,21 +275,21 @@ public class Region_Delegate {
		}

		@LayoutlibDelegate
		/package/ static boolean nativeSetRegion(int native_dst, int native_src) {
		/package/ static void nativeSetRegion(int native_dst, int native_src) {
		Region_Delegate dstRegion = sManager.getDelegate(native_dst);
		if (dstRegion == null) {
		return true;
		return;
		}

		Region_Delegate srcRegion = sManager.getDelegate(native_src);
		if (srcRegion == null) {
		return true;
		return;
		}

		dstRegion.mArea.reset();
		dstRegion.mArea.add(srcRegion.mArea);

		return true;
		return;
		}

		@LayoutlibDelegate

+9 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,15 @@ public class TestDelegates extends TestCase {
		originalClass.getName()),
		delegateMethod.getAnnotation(LayoutlibDelegate.class));

		// check the return type of the methods match.
		assertTrue(
		String.format("Delegate method %1$s.%2$s does not match the corresponding " +
		"framework method which returns %3$s",
		delegateClass.getName(),
		getMethodName(delegateMethod),
		originalMethod.getReturnType().getName()),
		delegateMethod.getReturnType() == originalMethod.getReturnType());

		// check that the method is static
		assertTrue(
		String.format(