From 78214c9531f936549bd9141ca7a6aa5ac27c8622 Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Fri, 28 Feb 2014 16:57:47 -0800 Subject: Fix null check for BaseObj.equals. Change-Id: I4f060697db175cbf0b5617c1220db853bbe53f1f --- rs/java/android/renderscript/BaseObj.java | 4 ++++ 1 file changed, 4 insertions(+) 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; } -- cgit v1.1