commit a3354a219068001848efa811a6cdf96c08b318bc
author Treehugger Robot <treehugger-gerrit@google.com> Sat Nov 17 00:44:09 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 17 00:44:09 2018 +0000
tree 678f55ff5638cc42113db775615606b09512d2d8
parent a864ea5f2d034069a3ede5fef9180e702666ee37
parent 5bd8b6a66c56cf6e21a145585f86c94b1a84cd7f

Merge "Avoid add overflow in summation in AMR-WB decoder"

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 7d1cfe2..bb73ead 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 apex {
-    name: "apex.media",
+    name: "com.android.media",
     manifest: "manifest.json",
     native_shared_libs: [
         // Extractor plugins
@@ -30,11 +30,11 @@
         // MediaPlayer2
         "libmedia2_jni",
     ],
-    key: "apex.media.key",
+    key: "com.android.media.key",
 }
 
 apex_key {
-    name: "apex.media.key",
+    name: "com.android.media.key",
     public_key: "media.avbpubkey",
     private_key: "media.pem",
 }

apex/file_contexts

diff --git a/apex/file_contexts b/apex/file_contexts
deleted file mode 100644
index 7dd840b..0000000
--- a/apex/file_contexts
+++ /dev/null
@@ -1,3 +0,0 @@
-(/.*)?                u:object_r:system_file:s0
-/manifest\.json   u:object_r:system_file:s0
-/lib(64)?(/.*)  u:object_r:system_lib_file:s0

media/libmediaplayerservice/StagefrightRecorder.cpp

diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index 30c0b1c..e3ae02e 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -1996,7 +1996,7 @@
         mTotalPausedDurationUs += resumeStartTimeUs - mPauseStartTimeUs - 30000;
     }
     double timeOffset = -mTotalPausedDurationUs;
-    if (mCaptureFpsEnable) {
+    if (mCaptureFpsEnable && (mVideoSource == VIDEO_SOURCE_CAMERA)) {
         timeOffset *= mCaptureFps / mFrameRate;
     }
     sp<MetaData> meta = new MetaData;