diff options
| author | Tim Murray <timmurray@google.com> | 2014-03-03 11:12:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-03 11:12:01 -0800 |
| commit | fb51a4301c8dc4d8ba1b6f84b55a76ec88d683dc (patch) | |
| tree | 10b624886fd2a7bf65928e856a7af3444d61e74b /rs | |
| parent | 26026c62788f508f9de0df608dd7043e7d1399f6 (diff) | |
| parent | 8377a4fd03d4fc367e0cb07af748ae941d9960a9 (diff) | |
| download | frameworks_base-fb51a4301c8dc4d8ba1b6f84b55a76ec88d683dc.zip frameworks_base-fb51a4301c8dc4d8ba1b6f84b55a76ec88d683dc.tar.gz frameworks_base-fb51a4301c8dc4d8ba1b6f84b55a76ec88d683dc.tar.bz2 | |
am 8377a4fd: Merge "Fix null check for BaseObj.equals."
* commit '8377a4fd03d4fc367e0cb07af748ae941d9960a9':
Fix null check for BaseObj.equals.
Diffstat (limited to 'rs')
| -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 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; } |