diff options
| author | Davor Bertovic <davor@losinj.com> | 2014-03-30 06:02:01 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@doa.deadnet.net> | 2014-03-30 06:02:01 -0400 |
| commit | 27a5ff71e1ef52f195122b5d56968a280ffd8052 (patch) | |
| tree | 2d9541b9af87562344a3e3da1d024dd3aad56b18 | |
| parent | 4a420c16c3684ce5deecef89800cfc536e735119 (diff) | |
| parent | 505388b8554d895aee107b7da770ff63474b436a (diff) | |
Merge "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 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); |