Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()"
am: 372b6b2c45
Change-Id: Iafa345df241f4f713451aa42a7169eddb57eb1ea
diff --git a/packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/BitmapTexture.java b/packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/BitmapTexture.java
index e708d53..f8b01cb 100644
--- a/packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/BitmapTexture.java
+++ b/packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/BitmapTexture.java
@@ -18,6 +18,8 @@
import android.graphics.Bitmap;
+import com.android.gallery3d.common.Utils;
+
// BitmapTexture is a texture whose content is specified by a fixed Bitmap.
//
// The texture does not own the Bitmap. The user should make sure the Bitmap
@@ -32,9 +34,7 @@
public BitmapTexture(Bitmap bitmap, boolean hasBorder) {
super(hasBorder);
- if (bitmap == null || bitmap.isRecycled()) {
- throw new AssertionError();
- }
+ Utils.assertTrue(bitmap != null && !bitmap.isRecycled());
mContentBitmap = bitmap;
}
diff --git a/packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/GLPaint.java b/packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/GLPaint.java
index 358b2dc..b26e9ab 100644
--- a/packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/GLPaint.java
+++ b/packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/GLPaint.java
@@ -16,6 +16,8 @@
package com.android.gallery3d.glrenderer;
+import com.android.gallery3d.common.Utils;
+
public class GLPaint {
private float mLineWidth = 1f;
private int mColor = 0;
@@ -29,9 +31,7 @@
}
public void setLineWidth(float width) {
- if (width < 0) {
- throw new AssertionError();
- }
+ Utils.assertTrue(width >= 0);
mLineWidth = width;
}
diff --git a/packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/UploadedTexture.java b/packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/UploadedTexture.java
index 2e87879..417102a 100644
--- a/packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/UploadedTexture.java
+++ b/packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/UploadedTexture.java
@@ -20,6 +20,8 @@
import android.graphics.Bitmap.Config;
import android.opengl.GLUtils;
+import com.android.gallery3d.common.Utils;
+
import java.util.HashMap;
import javax.microedition.khronos.opengles.GL11;
@@ -142,9 +144,7 @@
}
private void freeBitmap() {
- if (mBitmap == null) {
- throw new AssertionError();
- }
+ Utils.assertTrue(mBitmap != null);
onFreeBitmap(mBitmap);
mBitmap = null;
}
@@ -219,9 +219,7 @@
int texWidth = getTextureWidth();
int texHeight = getTextureHeight();
- if (bWidth > texWidth || bHeight > texHeight) {
- throw new AssertionError();
- }
+ Utils.assertTrue(bWidth <= texWidth && bHeight <= texHeight);
// Upload the bitmap to a new texture.
mId = canvas.getGLId().generateTexture();