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

resolved conflicts for merge of 1cbf8493 to master

Browse Source 
Change-Id: Ifea2ba8b02ecf291fbd1612973647a95a70511c4
This commit is contained in:
James Dong
2011-03-16 15:53:03 -07:00
parent 47a2a4eaad 1cbf8493da
commit 9fe05b7bc1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/libmedia/MediaProfiles.cpp
View File

@@ -722,8 +722,10 @@ MediaProfiles::createDefaultCamcorderProfiles(MediaProfiles *profiles)
profiles->mCamcorderProfiles.add(highTimeLapseProfile);
profiles->mCamcorderProfiles.add(highSpecificTimeLapseProfile);
// We only have the back-facing camera support by default.
profiles->mCameraIds.add(0);
// 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