PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing junit.framework.Assert from wallpaper picker code

Browse Source 
Bug: 22124692
Change-Id: Ifd41727a2ce4af660818b4f0cd6b95110ffdeec4
This commit is contained in:
Sunny Goyal
2015-06-26 14:10:44 -07:00
parent 11d4911732
commit 320a27b539
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WallpaperPicker/src/com/android/gallery3d/glrenderer/BitmapTexture.java
+2 -2
View File
@@ -18,7 +18,7 @@ package com.android.gallery3d.glrenderer;
import android.graphics.Bitmap;
import junit.framework.Assert;
import com.android.gallery3d.common.Utils;
// BitmapTexture is a texture whose content is specified by a fixed Bitmap.
//
@@ -34,7 +34,7 @@ public class BitmapTexture extends UploadedTexture {
public BitmapTexture(Bitmap bitmap, boolean hasBorder) {
super(hasBorder);
Assert.assertTrue(bitmap != null && !bitmap.isRecycled());
Utils.assertTrue(bitmap != null && !bitmap.isRecycled());
mContentBitmap = bitmap;
}
WallpaperPicker/src/com/android/gallery3d/glrenderer/GLPaint.java
+2 -2
View File
@@ -16,7 +16,7 @@
package com.android.gallery3d.glrenderer;
import junit.framework.Assert;
import com.android.gallery3d.common.Utils;
public class GLPaint {
private float mLineWidth = 1f;
@@ -31,7 +31,7 @@ public class GLPaint {
}
public void setLineWidth(float width) {
Assert.assertTrue(width >= 0);
Utils.assertTrue(width >= 0);
mLineWidth = width;
}
WallpaperPicker/src/com/android/gallery3d/glrenderer/UploadedTexture.java
+3 -4
View File
@@ -20,10 +20,9 @@ import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
import android.opengl.GLUtils;
import com.android.gallery3d.common.Utils;
import com.android.launcher3.util.Thunk;
import junit.framework.Assert;
import java.util.HashMap;
import javax.microedition.khronos.opengles.GL11;
@@ -146,7 +145,7 @@ public abstract class UploadedTexture extends BasicTexture {
}
private void freeBitmap() {
Assert.assertTrue(mBitmap != null);
Utils.assertTrue(mBitmap != null);
onFreeBitmap(mBitmap);
mBitmap = null;
}
@@ -221,7 +220,7 @@ public abstract class UploadedTexture extends BasicTexture {
int texWidth = getTextureWidth();
int texHeight = getTextureHeight();
Assert.assertTrue(bWidth <= texWidth && bHeight <= texHeight);
Utils.assertTrue(bWidth <= texWidth && bHeight <= texHeight);
// Upload the bitmap to a new texture.
mId = canvas.getGLId().generateTexture();