commit b182735757630db7e84e577c999b9e7d8a288353
author Chris Tate <ctate@android.com> Sat May 28 00:52:10 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 28 00:52:11 2016 +0000
tree 0d6e28db7ef26351bef80a6d57d25fca866c1647
parent 8a9100caaea34cadcd19910f5667407a29016d03
parent f135b271bfaa5a23f3af5a15ce59fd4ffb44a6be

Merge "Don't call .toString() on potentially null CharSequence" into nyc-dev

core/java/android/content/res/ResourcesImpl.java

diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java
index 32a2795..000751e 100644
--- a/core/java/android/content/res/ResourcesImpl.java
+++ b/core/java/android/content/res/ResourcesImpl.java
@@ -292,8 +292,10 @@
             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;
         }