commit 8377a4fd03d4fc367e0cb07af748ae941d9960a9
author Tim Murray <timmurray@google.com> Mon Mar 03 19:09:07 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 03 19:09:08 2014 +0000
tree 3c3d59ae3931f8618989c6fc3492c7e177b2483a
parent dd72b6e76c5d5e819809bd3d2ef4ff6f700af759
parent 78214c9531f936549bd9141ca7a6aa5ac27c8622

Merge "Fix null check for BaseObj.equals."

rs/java/android/renderscript/BaseObj.java

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 @@
         if (this == obj)
             return true;
 
+        if (obj == null) {
+            return false;
+        }
+
         if (getClass() != obj.getClass()) {
             return false;
         }