am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals."

* commit 'fb51a4301c8dc4d8ba1b6f84b55a76ec88d683dc': Fix null check for BaseObj.equals.
2014-03-03 20:21:27 +00:00
parent 3cff34742a fb51a4301c
commit 9f141fbb78
1 changed files with 4 additions and 0 deletions
--- 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;
        }