summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-03-07 17:24:02 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-07 17:24:02 -0800
commita5967faabad08cb5cd0c7098289fb62216dffbc6 (patch)
tree0f78823f9ad0253faa858dccbb880714b1a6803b
parent38978f57fec45748fd1eb7f96d25bc4e8415aabb (diff)
parentd3ee677783864d933cd8bc82c14666bd135d43bd (diff)
downloadframeworks_av-a5967faabad08cb5cd0c7098289fb62216dffbc6.zip
frameworks_av-a5967faabad08cb5cd0c7098289fb62216dffbc6.tar.gz
frameworks_av-a5967faabad08cb5cd0c7098289fb62216dffbc6.tar.bz2
Merge "Add the default back-facing camera to the MediaProfile camera vector As a result, missing media_profiles.xml will be still allowed."
-rw-r--r--media/libmedia/MediaProfiles.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp
index 7fb7aed..ca5bc38 100644
--- a/media/libmedia/MediaProfiles.cpp
+++ b/media/libmedia/MediaProfiles.cpp
@@ -721,6 +721,9 @@ MediaProfiles::createDefaultCamcorderProfiles(MediaProfiles *profiles)
createDefaultCamcorderTimeLapseHighProfiles(&highTimeLapseProfile, &highSpecificTimeLapseProfile);
profiles->mCamcorderProfiles.add(highTimeLapseProfile);
profiles->mCamcorderProfiles.add(highSpecificTimeLapseProfile);
+
+ // We only have the back-facing camera support by default.
+ profiles->mCameraIds.add(0);
}
/*static*/ void