Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()

Browse Source 
The previous changes to these files, which inlined the behavior
of Assert.assertTrue() were done in a hurry to fix the build.
This change makes use of the existing Utils.assertTrue() method
that was created for this purpose.

Bug: 30188076
Test: make checkbuild
Change-Id: Iacd505f8c3f7cefe6de94d30b56e39600bb9b0af
This commit is contained in:
Paul Duffin
2017-02-20 13:27:38 +00:00
parent 9598c98db0
commit 0589d8287e
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/BitmapTexture.java
View File

@@ -18,6 +18,8 @@ package com.android.gallery3d.glrenderer;
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 class BitmapTexture extends UploadedTexture {
public BitmapTexture(Bitmap bitmap, boolean hasBorder) {
super(hasBorder);
if (bitmap == null || bitmap.isRecycled()) {
throw new AssertionError();
}
Utils.assertTrue(bitmap != null && !bitmap.isRecycled());
mContentBitmap = bitmap;
}

6
packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/GLPaint.java
View File

@@ -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 class GLPaint {
}
public void setLineWidth(float width) {
if (width < 0) {
throw new AssertionError();
}
Utils.assertTrue(width >= 0);
mLineWidth = width;
}

10
packages/WallpaperCropper/src/com/android/gallery3d/glrenderer/UploadedTexture.java
View File

@@ -20,6 +20,8 @@ import android.graphics.Bitmap;
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 @@ public abstract class UploadedTexture extends BasicTexture {
}
private void freeBitmap() {
if (mBitmap == null) {
throw new AssertionError();
}
Utils.assertTrue(mBitmap != null);
onFreeBitmap(mBitmap);
mBitmap = null;
}
@@ -219,9 +219,7 @@ public abstract class UploadedTexture extends BasicTexture {
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();