summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2009-12-17 10:23:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-17 10:23:46 -0800
commitb5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb (patch)
tree345a2a58b9f210483ab60f259c682b6b7362e3d5 /cmds
parent0249c83ed014cc6a36caac30e55db62c29c204e2 (diff)
parent082e51712ab9c9ce94eaee88797bbdbc80b2004d (diff)
downloadframeworks_base-b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb.zip
frameworks_base-b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb.tar.gz
frameworks_base-b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb.tar.bz2
am 082e5171: Merge change I895fb7d7 into eclair-mr2
Merge commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d' into eclair-mr2-plus-aosp * commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d': Squashed commit of the following:
Diffstat (limited to 'cmds')
-rw-r--r--cmds/stagefright/stagefright.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index 376f3d9..ad6540a 100644
--- a/cmds/stagefright/stagefright.cpp
+++ b/cmds/stagefright/stagefright.cpp
@@ -345,12 +345,12 @@ int main(int argc, char **argv) {
sp<IOMX> omx = service->getOMX();
CHECK(omx.get() != NULL);
- List<String8> list;
+ List<IOMX::ComponentInfo> list;
omx->listNodes(&list);
- for (List<String8>::iterator it = list.begin();
+ for (List<IOMX::ComponentInfo>::iterator it = list.begin();
it != list.end(); ++it) {
- printf("%s\n", (*it).string());
+ printf("%s\n", (*it).mName.string());
}
}