drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More RS exceptions cleanup.

Browse Source 
Remove some dead code.

Change-Id: If97e3fdfe6de7bb28f22e1c5ee748c81cea3db93
This commit is contained in:
Jason Sams
2010-11-04 14:32:19 -07:00
parent cebfaab7a5
commit c1d6210fb5
7 changed files with 51 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
graphics/java/android/renderscript/BaseObj.java
View File

@ -33,7 +33,7 @@ class BaseObj {
public int getID() {
if (mDestroyed) {
throw new IllegalStateException("using a destroyed object.");
throw new RSInvalidStateException("using a destroyed object.");
}
return mID;
}
@ -43,13 +43,12 @@ class BaseObj {
String mName;
RenderScript mRS;
public void setName(String s) throws IllegalStateException, IllegalArgumentException
{
public void setName(String s) {
if(s.length() < 1) {
throw new IllegalArgumentException("setName does not accept a zero length string.");
throw new RSIllegalArgumentException("setName does not accept a zero length string.");
}
if(mName != null) {
throw new IllegalArgumentException("setName object already has a name.");
throw new RSIllegalArgumentException("setName object already has a name.");
}
try {
@ -61,8 +60,7 @@ class BaseObj {
}
}
protected void finalize() throws Throwable
{
protected void finalize() throws Throwable {
if (!mDestroyed) {
if(mID != 0 && mRS.isAlive()) {
mRS.nObjDestroy(mID);
@ -78,7 +76,7 @@ class BaseObj {
public void destroy() {
if(mDestroyed) {
throw new IllegalStateException("Object already destroyed.");
throw new RSInvalidStateException("Object already destroyed.");
}
mDestroyed = true;
mRS.nObjDestroy(mID);