Merge "Workaround for custom TypedArray injectors"

2017-01-05 18:59:57 +00:00
parent 8e780f4c33 abd917d139
commit 874d45597f
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/content/res/TypedArray.java
+++ b/core/java/android/content/res/TypedArray.java
@@ -79,7 +79,7 @@ public class TypedArray {
        final int dataLen = len * AssetManager.STYLE_NUM_ENTRIES;
        final int indicesLen = len + 1;
        final VMRuntime runtime = VMRuntime.getRuntime();
-        if (mData == null || mData.length < dataLen) {
+        if (mDataAddress == 0 || mData.length < dataLen) {
            mData = (int[]) runtime.newNonMovableArray(int.class, dataLen);
            mDataAddress = runtime.addressOf(mData);
            mIndices = (int[]) runtime.newNonMovableArray(int.class, indicesLen);