Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1827357 authored by Chris Tate's avatar Chris Tate Committed by Android (Google) Code Review
Browse files

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

parents 8a9100ca f135b271

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

+4 −2
Original line number Diff line number Diff line
@@ -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;

        }