diff options
| author | Davor Bertovic <davor@losinj.com> | 2014-04-01 11:19:36 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@doa.deadnet.net> | 2014-04-01 11:19:36 -0400 |
| commit | 41ef8ef4be08080464784f60822b4f3a2350226c (patch) | |
| tree | 82879ec245a417971d35a33cc0df5c2c1b213e6d | |
| parent | 9bca1c7ab913900addb45b342b0f4c550609bb3a (diff) | |
| parent | 7317181ced95668e702c14b97f1136f964047671 (diff) | |
Merge "Revert "Revert "Don't implicitly cast NULL to a bool""" into kitkat
| -rw-r--r-- | vm/reflect/Annotation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vm/reflect/Annotation.cpp b/vm/reflect/Annotation.cpp index 942027c7b..bbd58e953 100644 --- a/vm/reflect/Annotation.cpp +++ b/vm/reflect/Annotation.cpp @@ -1288,7 +1288,7 @@ bool dvmIsClassAnnotationPresent(const ClassObject* clazz, { const DexAnnotationSetItem* pAnnoSet = findAnnotationSetForClass(clazz); if (pAnnoSet == NULL) { - return NULL; + return false; } const DexAnnotationItem* pAnnoItem = getAnnotationItemFromAnnotationSet( clazz, pAnnoSet, kDexVisibilityRuntime, annotationClazz); @@ -1743,7 +1743,7 @@ bool dvmIsMethodAnnotationPresent(const ClassObject* clazz, { const DexAnnotationSetItem* pAnnoSet = findAnnotationSetForMethod(method); if (pAnnoSet == NULL) { - return NULL; + return false; } const DexAnnotationItem* pAnnoItem = getAnnotationItemFromAnnotationSet( clazz, pAnnoSet, kDexVisibilityRuntime, annotationClazz); @@ -2053,7 +2053,7 @@ bool dvmIsFieldAnnotationPresent(const ClassObject* clazz, { const DexAnnotationSetItem* pAnnoSet = findAnnotationSetForField(field); if (pAnnoSet == NULL) { - return NULL; + return false; } const DexAnnotationItem* pAnnoItem = getAnnotationItemFromAnnotationSet( clazz, pAnnoSet, kDexVisibilityRuntime, annotationClazz); |