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

Commit 80572f6a authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of 1cbf8493 to master"

parents 94e085fd 9fe05b7b

media/libmedia/MediaProfiles.cpp

+4 −2
Original line number Diff line number Diff line
@@ -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