diff options
| author | Tim Murray <timmurray@google.com> | 2014-03-03 19:09:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-03 19:09:08 +0000 |
| commit | 8377a4fd03d4fc367e0cb07af748ae941d9960a9 (patch) | |
| tree | 3c3d59ae3931f8618989c6fc3492c7e177b2483a /rs/java | |
| parent | dd72b6e76c5d5e819809bd3d2ef4ff6f700af759 (diff) | |
| parent | 78214c9531f936549bd9141ca7a6aa5ac27c8622 (diff) | |
| download | frameworks_base-8377a4fd03d4fc367e0cb07af748ae941d9960a9.zip frameworks_base-8377a4fd03d4fc367e0cb07af748ae941d9960a9.tar.gz frameworks_base-8377a4fd03d4fc367e0cb07af748ae941d9960a9.tar.bz2 | |
Merge "Fix null check for BaseObj.equals."
Diffstat (limited to 'rs/java')
| -rw-r--r-- | rs/java/android/renderscript/BaseObj.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rs/java/android/renderscript/BaseObj.java b/rs/java/android/renderscript/BaseObj.java index b386dd7..1372ab7 100644 --- a/rs/java/android/renderscript/BaseObj.java +++ b/rs/java/android/renderscript/BaseObj.java @@ -181,6 +181,10 @@ public class BaseObj { if (this == obj) return true; + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { return false; } |