diff options
| -rw-r--r-- | core/java/android/content/res/ResourcesImpl.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java index 32a27951677a..000751e88639 100644 --- a/core/java/android/content/res/ResourcesImpl.java +++ b/core/java/android/content/res/ResourcesImpl.java @@ -292,8 +292,10 @@ public class ResourcesImpl { return mAssets.openNonAsset(value.assetCookie, value.string.toString(), AssetManager.ACCESS_STREAMING); } catch (Exception e) { - NotFoundException rnf = new NotFoundException("File " + value.string.toString() + - " from drawable resource ID #0x" + Integer.toHexString(id)); + // Note: value.string might be null + NotFoundException rnf = new NotFoundException("File " + + (value.string == null ? "(null)" : value.string.toString()) + + " from drawable resource ID #0x" + Integer.toHexString(id)); rnf.initCause(e); throw rnf; } |