summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2009-12-17 10:27:48 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-17 10:27:48 -0800
commit4f471648e976d4f0000bd0dbcd0b4ebc4e0b16dd (patch)
treeb542dffb1f8c45a5a783a6d12e6b1e7295e19509 /cmds
parentf7ed3a2b0fd00c517671cc986b4b44d29b60ac28 (diff)
parentb5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb (diff)
downloadframeworks_base-4f471648e976d4f0000bd0dbcd0b4ebc4e0b16dd.zip
frameworks_base-4f471648e976d4f0000bd0dbcd0b4ebc4e0b16dd.tar.gz
frameworks_base-4f471648e976d4f0000bd0dbcd0b4ebc4e0b16dd.tar.bz2
am b5c6be6d: am 082e5171: Merge change I895fb7d7 into eclair-mr2
Merge commit 'b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb' * commit 'b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb': 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());
}
}