From 505388b8554d895aee107b7da770ff63474b436a Mon Sep 17 00:00:00 2001
From: Davor Bertovic <davor@losinj.com>
Date: Sun, 30 Mar 2014 06:01:58 -0400
Subject: Revert "Don't implicitly cast NULL to a bool"

This reverts commit 734b384dba2c6c7d2c16e78e0babb383e5f2200a.

Change-Id: Iac1d86c9bb11816a981e8849c9b0d3a95d264412
---
 vm/reflect/Annotation.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vm/reflect/Annotation.cpp b/vm/reflect/Annotation.cpp
index bbd58e953..942027c7b 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 false;
+        return NULL;
     }
     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 false;
+        return NULL;
     }
     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 false;
+        return NULL;
     }
     const DexAnnotationItem* pAnnoItem = getAnnotationItemFromAnnotationSet(
             clazz, pAnnoSet, kDexVisibilityRuntime, annotationClazz);
-- 
cgit v1.2.3