diff options
| author | Stephen Hines <srhines@google.com> | 2012-02-15 15:21:01 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-15 15:21:01 -0800 |
| commit | f6fb3ab8c02a96391340b1f21a9eb6800171c141 (patch) | |
| tree | d85f731baeecd58c884a6409e83a8a469baf3838 /graphics | |
| parent | 6be163651c988736e0fd2af4bc4dc1e59753d7ee (diff) | |
| parent | 209481137147e64c72f1d5737085b17736931bda (diff) | |
| download | frameworks_base-f6fb3ab8c02a96391340b1f21a9eb6800171c141.zip frameworks_base-f6fb3ab8c02a96391340b1f21a9eb6800171c141.tar.gz frameworks_base-f6fb3ab8c02a96391340b1f21a9eb6800171c141.tar.bz2 | |
Merge "Update Element.isCompatible() to work with NONE."
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/renderscript/Element.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java index f6a0281..2c0925b 100644 --- a/graphics/java/android/renderscript/Element.java +++ b/graphics/java/android/renderscript/Element.java @@ -933,10 +933,10 @@ public class Element extends BaseObj { // Ignore mKind because it is allowed to be different (user vs. pixel). // We also ignore mNormalized because it can be different. The mType - // field must be non-null since we require name equivalence for - // user-created Elements. + // field must not be NONE since we require name equivalence for + // all user-created Elements. return ((mSize == e.mSize) && - (mType != null) && + (mType != DataType.NONE) && (mType == e.mType) && (mVectorSize == e.mVectorSize)); } |