Merge "Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b182735757 am: 8cc9f36067 am: 6d31571950"

2016-05-28 01:12:27 +00:00
parent 0794f537da b787a5cb6b
commit 723e5dcdf0
1 changed files with 4 additions and 2 deletions
--- 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;
        }