Permalink
Browse files

am 6dea157: Merge "fix dvmDbgOutputAllInterfaces to include only dire…

…ct super-interfaces"

* commit '6dea1575fd44aeee1dbe4d2bb184357598581652':
  fix dvmDbgOutputAllInterfaces to include only direct super-interfaces
  • Loading branch information...
2 parents 4dfe64e + 6dea157 commit 88e959ed52764b0fa27fa80adebe9c3d8a3b8324 Jean-Baptiste Queru committed with Android Git Automerger Jan 13, 2012
Showing with 4 additions and 9 deletions.
  1. +4 −9 vm/Debugger.cpp
View
@@ -1264,20 +1264,15 @@ void dvmDbgOutputAllMethods(RefTypeId refTypeId, bool withGeneric,
void dvmDbgOutputAllInterfaces(RefTypeId refTypeId, ExpandBuf* pReply)
{
ClassObject* clazz;
- int i, start, count;
+ int i, count;
clazz = refTypeIdToClassObject(refTypeId);
assert(clazz != NULL);
- if (clazz->super == NULL)
- start = 0;
- else
- start = clazz->super->iftableCount;
-
- count = clazz->iftableCount - start;
+ count = clazz->interfaceCount;
expandBufAdd4BE(pReply, count);
- for (i = start; i < clazz->iftableCount; i++) {
- ClassObject* iface = clazz->iftable[i].clazz;
+ for (i = 0; i < count; i++) {
+ ClassObject* iface = clazz->interfaces[i];
expandBufAddRefTypeId(pReply, classObjectToRefTypeId(iface));
}
}

0 comments on commit 88e959e

Please sign in to comment.