Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 28fc2037: am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1

Browse Source 
* commit '28fc2037bffd1593b56fe1e1522de544a7d49120':
  Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
This commit is contained in:
James Dong
2011-03-16 15:12:58 -07:00
committed by Android Git Automerger
parent 0c4f09be5b 28fc2037bf
commit 1cbf8493da
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/libmedia/MediaProfiles.cpp
View File

@@ -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