diff options
| author | 2014-03-03 20:55:31 +0000 | |
|---|---|---|
| committer | 2014-03-03 20:55:31 +0000 | |
| commit | 8d2e9a0859bb26bf246efa4b6c81992c48b2120c (patch) | |
| tree | 27ebf386c2352aa892c3d5c06b95ba2285ceea1f /rs/java | |
| parent | 83b607a332dd57e76484c7ec1789e59d7c622b5d (diff) | |
| parent | 4db08b044dfbd01912353f0c85a43973407d98b0 (diff) | |
am 4db08b04: am 9f141fbb: am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals."
* commit '4db08b044dfbd01912353f0c85a43973407d98b0':
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 b386dd7e6dc0..1372ab79e264 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; } |