commit a3e4fe3fd4f24ebcf9e69de52e2f0d3e2be3a816
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 30 17:26:22 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 30 17:26:22 2019 +0000
tree b0571aa7b4a32f8ffe9d94952f6ce34e4fd946d6
parent f3f261a7c8bbdc2dbe2a92e4fe3f10830c0ae6b1
parent db3fa5f9ff069697b70f2a702177f1db83a6d5b7

Merge "Throw exception on mismatched system vs vendor"

media/libstagefright/rtsp/ASessionDescription.cpp

diff --git a/media/libstagefright/rtsp/ASessionDescription.cpp b/media/libstagefright/rtsp/ASessionDescription.cpp
index 325084c..c581e9d 100644
--- a/media/libstagefright/rtsp/ASessionDescription.cpp
+++ b/media/libstagefright/rtsp/ASessionDescription.cpp
@@ -261,7 +261,7 @@
         return false;
     }
 
-    if (strncmp(value.c_str(), "npt=", 4)) {
+    if (strncmp(value.c_str(), "npt=", 4) && strncmp(value.c_str(), "npt:", 4)) {
         return false;
     }
 

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index cf9c298..46f51e5 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -555,7 +555,6 @@
         muteWaitMs = setOutputDevices(mPrimaryOutput, rxDevices, true, delayMs);
     } else { // create RX path audio patch
         mCallRxPatch = createTelephonyPatch(true /*isRx*/, rxDevices.itemAt(0), delayMs);
-        ALOG_ASSERT(createTxPatch, "No Tx Patch will be created, nor legacy routing done");
     }
     if (createTxPatch) { // create TX path audio patch
         mCallTxPatch = createTelephonyPatch(false /*isRx*/, txSourceDevice, delayMs);