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

Commit b787a5cb 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... 

Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b1827357 am: 8cc9f360
am: 6d315719

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

Change-Id: I22099d2d55539af4ed13d4121296402b9596f631
parents e1bd3ce3 6d315719

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -292,8 +292,10 @@ public class ResourcesImpl { 
            return mAssets.openNonAsset(value.assetCookie, value.string.toString(),

            return mAssets.openNonAsset(value.assetCookie, value.string.toString(),

                    AssetManager.ACCESS_STREAMING);

                    AssetManager.ACCESS_STREAMING);

        } catch (Exception e) {

        } catch (Exception e) {

            NotFoundException rnf = new NotFoundException("File " + value.string.toString() +

            // Note: value.string might be null

                    " from drawable resource ID #0x" + Integer.toHexString(id));

            NotFoundException rnf = new NotFoundException("File "

                    + (value.string == null ? "(null)" : value.string.toString())

                    + " from drawable resource ID #0x" + Integer.toHexString(id));

            rnf.initCause(e);

            rnf.initCause(e);

            throw rnf;

            throw rnf;

        }

        }