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

Commit e73e14fd authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO... 

am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '8ed784e2':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
parents ec50dfc0 8ed784e2

tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java

+3 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public final class BridgeTypedArray extends TypedArray { 
        // first count the array size

        int count = 0;

        for (ResourceValue data : mResourceData) {

            if (data != null) {

            if (data != null && !RenderResources.REFERENCE_NULL.equals(data.getValue())) {

                count++;

            }

        }
@@ -103,7 +103,8 @@ public final class BridgeTypedArray extends TypedArray { 
        // fill the array with the indices.

        int index = 1;

        for (int i = 0 ; i < mResourceData.length ; i++) {

            if (mResourceData[i] != null) {

            if (mResourceData[i] != null

                    && !RenderResources.REFERENCE_NULL.equals(mResourceData[i].getValue())) {

                mIndices[index++] = i;

            }

        }