summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-03-16 14:09:50 -0700
committerJames Dong <jdong@google.com>2011-03-16 14:11:32 -0700
commit6ec0ca9e8eb78faeae198a67978ce630cc128946 (patch)
tree8ec90e3b982b890e88807c9bfa81fda98f170e95 /media
parent6bb2020e6e9914f6df3dc7d69dbd21782267fbd4 (diff)
downloadframeworks_base-6ec0ca9e8eb78faeae198a67978ce630cc128946.zip
frameworks_base-6ec0ca9e8eb78faeae198a67978ce630cc128946.tar.gz
frameworks_base-6ec0ca9e8eb78faeae198a67978ce630cc128946.tar.bz2
Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
bug - 4109530 Change-Id: Ib83be7a7f767a4b20ac338734ada1581e7a4c5bf
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/MediaProfiles.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp
index 7fb7aed..e6f3a33 100644
--- a/media/libmedia/MediaProfiles.cpp
+++ b/media/libmedia/MediaProfiles.cpp
@@ -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