summaryrefslogtreecommitdiffstats
path: root/rs/java/android/renderscript/BaseObj.java
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2014-02-28 16:57:47 -0800
committerTim Murray <timmurray@google.com>2014-02-28 16:57:47 -0800
commit78214c9531f936549bd9141ca7a6aa5ac27c8622 (patch)
tree1205222db07558a794026190ef2d7c2ccc6815a1 /rs/java/android/renderscript/BaseObj.java
parente4dae5f2c26f5992a31f8ce15811fc082647ddb8 (diff)
downloadframeworks_base-78214c9531f936549bd9141ca7a6aa5ac27c8622.zip
frameworks_base-78214c9531f936549bd9141ca7a6aa5ac27c8622.tar.gz
frameworks_base-78214c9531f936549bd9141ca7a6aa5ac27c8622.tar.bz2
Fix null check for BaseObj.equals.
Change-Id: I4f060697db175cbf0b5617c1220db853bbe53f1f
Diffstat (limited to 'rs/java/android/renderscript/BaseObj.java')
-rw-r--r--rs/java/android/renderscript/BaseObj.java4
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;
}