summaryrefslogtreecommitdiffstats
path: root/vm/reflect
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-12-20 16:22:13 +0000
committerSteve Block <steveblock@google.com>2012-01-03 22:29:27 +0000
commit062bf509a77fce9dfcb7e7b2e401cf2a124d83d5 (patch)
tree6015cb53c42eb9ae2d13811da33381701a7c353a /vm/reflect
parent26f957278b34144a3f90989ccddb0102fc1fdd62 (diff)
downloadandroid_dalvik-062bf509a77fce9dfcb7e7b2e401cf2a124d83d5.tar.gz
android_dalvik-062bf509a77fce9dfcb7e7b2e401cf2a124d83d5.tar.bz2
android_dalvik-062bf509a77fce9dfcb7e7b2e401cf2a124d83d5.zip
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: Ic663376d1ad6a6cb14bf81405ad9afd247cf2f60
Diffstat (limited to 'vm/reflect')
-rw-r--r--vm/reflect/Annotation.cpp12
-rw-r--r--vm/reflect/Proxy.cpp2
-rw-r--r--vm/reflect/Reflect.cpp8
3 files changed, 11 insertions, 11 deletions
diff --git a/vm/reflect/Annotation.cpp b/vm/reflect/Annotation.cpp
index 55de1ad2c..4aa5c06b8 100644
--- a/vm/reflect/Annotation.cpp
+++ b/vm/reflect/Annotation.cpp
@@ -245,12 +245,12 @@ static Method* resolveAmbiguousMethod(const ClassObject* referrer, u4 methodIdx)
resClass = dvmResolveClass(referrer, pMethodId->classIdx, true);
if (resClass == NULL) {
/* note exception will be pending */
- LOGD("resolveAmbiguousMethod: unable to find class %d", methodIdx);
+ ALOGD("resolveAmbiguousMethod: unable to find class %d", methodIdx);
return NULL;
}
if (dvmIsInterfaceClass(resClass)) {
/* method is part of an interface -- not expecting that */
- LOGD("resolveAmbiguousMethod: method in interface?");
+ ALOGD("resolveAmbiguousMethod: method in interface?");
return NULL;
}
@@ -700,7 +700,7 @@ static Object* createAnnotationMember(const ClassObject* clazz,
dvmCallMethod(self, gDvm.methOrgApacheHarmonyLangAnnotationAnnotationMember_init,
newMember, &unused, nameObj, valueObj, methodReturn, methodObj);
if (dvmCheckException(self)) {
- LOGD("Failed constructing annotation element");
+ ALOGD("Failed constructing annotation element");
goto bail;
}
@@ -801,7 +801,7 @@ static Object* processEncodedAnnotation(const ClassObject* clazz,
gDvm.methOrgApacheHarmonyLangAnnotationAnnotationFactory_createAnnotation,
NULL, &result, annoClass, elementArray);
if (dvmCheckException(self)) {
- LOGD("Failed creating an annotation");
+ ALOGD("Failed creating an annotation");
//dvmLogExceptionStackTrace();
goto bail;
}
@@ -1476,7 +1476,7 @@ bool dvmGetInnerClass(const ClassObject* clazz, StringObject** pName,
/* parse it into an Object */
AnnotationValue avalue;
if (!processAnnotationValue(clazz, &ptr, &avalue, kAllObjects)) {
- LOGD("processAnnotationValue failed on InnerClass member 'name'");
+ ALOGD("processAnnotationValue failed on InnerClass member 'name'");
return false;
}
@@ -1855,7 +1855,7 @@ Object* dvmGetAnnotationDefaultValue(const Method* method)
/* got it, pull it out */
AnnotationValue avalue;
if (!processAnnotationValue(clazz, &ptr, &avalue, kAllObjects)) {
- LOGD("processAnnotationValue failed on default for '%s'",
+ ALOGD("processAnnotationValue failed on default for '%s'",
method->name);
return NULL;
}
diff --git a/vm/reflect/Proxy.cpp b/vm/reflect/Proxy.cpp
index 56f88c56b..b022263e8 100644
--- a/vm/reflect/Proxy.cpp
+++ b/vm/reflect/Proxy.cpp
@@ -190,7 +190,7 @@ ClassObject* dvmGenerateProxyClass(StringObject* str, ArrayObject* interfaces,
*/
newClass->status = CLASS_LOADED;
if (!dvmLinkClass(newClass)) {
- LOGD("Proxy class link failed");
+ ALOGD("Proxy class link failed");
goto bail;
}
diff --git a/vm/reflect/Reflect.cpp b/vm/reflect/Reflect.cpp
index 3406a287a..861300f34 100644
--- a/vm/reflect/Reflect.cpp
+++ b/vm/reflect/Reflect.cpp
@@ -250,7 +250,7 @@ static Object* createFieldObject(Field* field, const ClassObject* clazz)
dvmCallMethod(dvmThreadSelf(), gDvm.methJavaLangReflectField_init,
fieldObj, &unused, clazz, type, nameObj, slot);
if (dvmCheckException(dvmThreadSelf())) {
- LOGD("Field class init threw exception");
+ ALOGD("Field class init threw exception");
goto bail;
}
@@ -430,7 +430,7 @@ static Object* createConstructorObject(Method* meth)
dvmCallMethod(dvmThreadSelf(), gDvm.methJavaLangReflectConstructor_init,
consObj, &unused, meth->clazz, params, exceptions, slot);
if (dvmCheckException(dvmThreadSelf())) {
- LOGD("Constructor class init threw exception");
+ ALOGD("Constructor class init threw exception");
goto bail;
}
@@ -583,7 +583,7 @@ Object* dvmCreateReflectMethodObject(const Method* meth)
methObj, &unused, meth->clazz, params, exceptions, returnType,
nameObj, slot);
if (dvmCheckException(dvmThreadSelf())) {
- LOGD("Method class init threw exception");
+ ALOGD("Method class init threw exception");
goto bail;
}
@@ -1109,7 +1109,7 @@ bool dvmUnboxPrimitive(Object* value, ClassObject* returnType,
if (typeIndex == PRIM_NOT) {
if (value != NULL && !dvmInstanceof(value->clazz, returnType)) {
- LOGD("wrong object type: %s %s",
+ ALOGD("wrong object type: %s %s",
value->clazz->descriptor, returnType->descriptor);
return false;
}