Revert "Revert "Don't implicitly cast NULL to a bool""

This reverts commit 505388b8554d895aee107b7da770ff63474b436a.

Change-Id: I795141c00c5943f0f1fd0059fe6ab85e003ae224

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);