commit 0eb2020e959e9dda803fedde921ea6db85897572
author huans <huans@google.com> Thu Aug 17 09:44:57 2017 -0700
committer Huan Song <huans@google.com> Mon Jan 29 20:07:14 2018 +0000
tree a61b15738ed94e521c0f340c3c2e8c0b8c328956
parent 97b2eefacf3616a3025d25831a11466059f12967

Fix O-CTS CameraEvictionTest#testMediaRecorderCameraActivityEviction

Bug: 64769399
Test: test case passes
Change-Id: I1c78bd820a902bd1ad280c48e996b4b6261d226e
(cherry picked from commit da0f441557732458a678ba43577ab100c15a7e1e)

camera/media_profiles.xml

diff --git a/camera/media_profiles.xml b/camera/media_profiles.xml
index a5970d0..42475bc 100644
--- a/camera/media_profiles.xml
+++ b/camera/media_profiles.xml
@@ -80,7 +80,7 @@
     <CamcorderProfiles cameraId="0">
 
         <EncoderProfile quality="qvga" fileFormat="mp4" duration="60">
-            <Video codec="m4v"
+            <Video codec="h264"
                    bitRate="128000"
                    width="320"
                    height="240"