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

Commit 723e5dcd authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b1827357 am: 8cc9f360 am: 6d315719"
parents 0794f537 b787a5cb
Loading
Loading
Loading
Loading
+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;
        }