Skip to content

Commit f6fb3ab

Browse files
stephenhinesAndroid (Google) Code Review
authored andcommitted
Merge "Update Element.isCompatible() to work with NONE."
2 parents 6be1636 + 2094811 commit f6fb3ab

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

graphics/java/android/renderscript/Element.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -933,10 +933,10 @@ public boolean isCompatible(Element e) {
933933

934934
// Ignore mKind because it is allowed to be different (user vs. pixel).
935935
// We also ignore mNormalized because it can be different. The mType
936-
// field must be non-null since we require name equivalence for
937-
// user-created Elements.
936+
// field must not be NONE since we require name equivalence for
937+
// all user-created Elements.
938938
return ((mSize == e.mSize) &&
939-
(mType != null) &&
939+
(mType != DataType.NONE) &&
940940
(mType == e.mType) &&
941941
(mVectorSize == e.mVectorSize));
942942
}

0 commit comments

Comments
 (0)