diff options
| author | James Dong <jdong@google.com> | 2011-03-16 15:11:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-16 15:11:03 -0700 |
| commit | 28fc2037bffd1593b56fe1e1522de544a7d49120 (patch) | |
| tree | 58f521886028a4ac311fdf9ad64473d3769e85ef /media | |
| parent | f2532d16a4a2ca4dffe9bf9568fdd24475369cac (diff) | |
| parent | fc59176241f498ad4eeb4237800c2eb5edd9efcd (diff) | |
| download | frameworks_base-28fc2037bffd1593b56fe1e1522de544a7d49120.zip frameworks_base-28fc2037bffd1593b56fe1e1522de544a7d49120.tar.gz frameworks_base-28fc2037bffd1593b56fe1e1522de544a7d49120.tar.bz2 | |
am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
* commit 'fc59176241f498ad4eeb4237800c2eb5edd9efcd':
Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/MediaProfiles.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp index 7fb7aed..e6f3a33 100644 --- a/media/libmedia/MediaProfiles.cpp +++ b/media/libmedia/MediaProfiles.cpp @@ -721,6 +721,11 @@ MediaProfiles::createDefaultCamcorderProfiles(MediaProfiles *profiles) createDefaultCamcorderTimeLapseHighProfiles(&highTimeLapseProfile, &highSpecificTimeLapseProfile); profiles->mCamcorderProfiles.add(highTimeLapseProfile); profiles->mCamcorderProfiles.add(highSpecificTimeLapseProfile); + + // For emulator and other legacy devices which does not have a + // media_profiles.xml file, We assume that the default camera id + // is 0 and that is the only camera available. + profiles->mCameraIds.push(0); } /*static*/ void |