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

am e05bc81c: Merge "We should not throw for non-fatal errors."

Browse Source 
* commit 'e05bc81c19838801b91de2642dc275a16dd7cf71':
  We should not throw for non-fatal errors.
This commit is contained in:
Stephen Hines
2012-02-03 15:37:52 -08:00
committed by Android Git Automerger
parent c83d64acfc e05bc81c19
commit 0b1ad704f4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/java/android/renderscript/RenderScript.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2008 The Android Open Source Project
* Copyright (C) 2008-2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -848,7 +848,8 @@ public class RenderScript {
mRS.mErrorCallback.mErrorNum = subID;
mRS.mErrorCallback.run();
} else {
throw new RSRuntimeException("Received error num " + subID + ", details: " + e);
// Do not throw here. In these cases, we do not have
// a fatal error.
}
continue;
}