Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cbf8493 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 28fc2037: am fc591762: Merge "Add the default camera id to mCameraIds for... 

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

* commit '28fc2037':
  Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
parents 0c4f09be 28fc2037

media/libmedia/MediaProfiles.cpp

+5 −0
Original line number Diff line number Diff line
@@ -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