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

Commit 4b72eec3 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Code Review
Browse files

Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE... 

Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
parents ec1a8f7a 41a5ed7c

core/java/android/content/res/AssetManager.java

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ public final class AssetManager { 
            StringBlock[] blocks = mStringBlocks;

            if (blocks == null) {

                ensureStringBlocks();

                blocks = mStringBlocks;

            }

            outValue.string = blocks[block].get(outValue.data);

            return true;