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

Commit 7317034d authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

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

am: b1827357

* commit 'b1827357':
  Don't call .toString() on potentially null CharSequence

Change-Id: I5c8253739fa06b07abd4d67b4947c6bed153d010
parents c5808444 b1827357

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;

        }