summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alan Viverette <alanv@google.com> 2015-08-31 11:36:16 -0400
committer Alan Viverette <alanv@google.com> 2015-08-31 11:36:16 -0400
commitc725e8d5ea04ffb5821e00db1c6b45cfe2130e05 (patch)
tree1ad0cc55d19da4930d3cc3ebe116b01f41cfdda1
parentd69bb6109322cd5a3a7a005b99393018d7e97d0d (diff)
Add missing @param in ResourceManager, set InflateException source
Bug: 11695070 Change-Id: I94a4980688a952c1f59f1cb15cf2192e3c51de90
-rw-r--r--core/java/android/app/ResourcesManager.java1
-rw-r--r--graphics/java/android/graphics/drawable/DrawableInflater.java5
2 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java
index 1605b3e091dc..318798458ef0 100644
--- a/core/java/android/app/ResourcesManager.java
+++ b/core/java/android/app/ResourcesManager.java
@@ -154,6 +154,7 @@ public class ResourcesManager {
* @param displayId display Id.
* @param overrideConfiguration override configurations.
* @param compatInfo the compatibility info. Must not be null.
+ * @param classLoader the class loader for the resource package
*/
Resources getTopLevelResources(String resDir, String[] splitResDirs,
String[] overlayDirs, String[] libDirs, int displayId,
diff --git a/graphics/java/android/graphics/drawable/DrawableInflater.java b/graphics/java/android/graphics/drawable/DrawableInflater.java
index f3657d33bf8d..348af70d5568 100644
--- a/graphics/java/android/graphics/drawable/DrawableInflater.java
+++ b/graphics/java/android/graphics/drawable/DrawableInflater.java
@@ -203,7 +203,10 @@ public final class DrawableInflater {
throw ie;
} catch (ClassNotFoundException e) {
// If loadClass fails, we should propagate the exception.
- throw new InflateException("Class not found " + className);
+ final InflateException ie = new InflateException(
+ "Class not found " + className);
+ ie.initCause(e);
+ throw ie;
} catch (Exception e) {
final InflateException ie = new InflateException(
"Error inflating class " + className);