Merge cherrypicks of ['googleplex-android-review.googlesource.com/26094789', 'googleplex-android-review.googlesource.com/25989695'] into udc-d2-release.android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release

Change-Id: I356d054be860bb468a563f1b496a05c335897a5c

2 files changed, 19 insertions, 2 deletions

diff --git a/service/src/com/android/telephony/imsmedia/config/ConfigPreference.java b/service/src/com/android/telephony/imsmedia/config/ConfigPreference.java
index 17518c10..553c92cd 100644
--- a/service/src/com/android/telephony/imsmedia/config/ConfigPreference.java
+++ b/service/src/com/android/telephony/imsmedia/config/ConfigPreference.java
@@ -15,6 +15,7 @@
  */
 package com.android.telephony.imsmedia.config;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -33,6 +34,7 @@ import com.android.telephony.imsmedia.R;
  */
 public class ConfigPreference extends PreferenceActivity {
     private static final String LOG_TAG = "ConfigPreference";
+    private static final String PREFERENCE_ACTION = "com.android.telephony.imsmedia.PREFERENCE";
     private static final String KEY_LOG_MODE = "list_log_level";
     private static final String KEY_DEBUG_LOG_MODE_SOCKET = "log_mode_socket";
     private static final String KEY_DEBUG_LOG_MODE_AUDIO = "log_mode_audio";
@@ -95,6 +97,17 @@ public class ConfigPreference extends PreferenceActivity {
         Log.d(LOG_TAG, "onCreate");
 
         super.onCreate(savedInstanceState);
+
+        String action = getIntent().getAction();
+
+        // The Configuration Menu is blocked for production builds
+        // and access in debug/eng builds is restricted to preference action
+        if (!Build.IS_DEBUGGABLE || !(action != null && action.equals(PREFERENCE_ACTION))) {
+            Log.e(LOG_TAG, "Configuration Menu cannot be launched");
+            finish(); // Close the current activity
+            return;
+        }
+
         Window wd = getWindow();
 
         if (wd != null) {
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/AudioRtpPayloadEncoderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/AudioRtpPayloadEncoderNode.cpp
index 4bc2c433..b101d0b3 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/AudioRtpPayloadEncoderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/AudioRtpPayloadEncoderNode.cpp
@@ -20,6 +20,8 @@
 #include <AudioConfig.h>
 #include <EvsParams.h>
 
+#define EVS_MODE_SID 12
+
 AudioRtpPayloadEncoderNode::AudioRtpPayloadEncoderNode(BaseSessionCallback* callback) :
         BaseNode(callback)
 {
@@ -449,7 +451,9 @@ void AudioRtpPayloadEncoderNode::EncodePayloadEvs(
 
         if (mEvsCodecMode == kEvsCodecModePrimary)
         {
-            if (nFrameType == kImsAudioEvsPrimaryModeSID || mSendCMR)  // CMR value
+            nFrameType = (uint32_t)ImsMediaAudioUtil::ConvertLenToEVSAudioMode(nDataSize);
+
+            if (nFrameType == EVS_MODE_SID || mSendCMR == 1)  // CMR value
             {
                 // Header Type identification bit(1bit) - always set to 1
                 cmr_h = 1;
@@ -473,7 +477,7 @@ void AudioRtpPayloadEncoderNode::EncodePayloadEvs(
             if (mCurrNumOfFrame == 1)
             {
                 // set CMR byte - it's optional field...
-                if (nFrameType == kImsAudioEvsPrimaryModeSID || mSendCMR)
+                if (nFrameType == EVS_MODE_SID || mSendCMR == 1)
                 {
                     // check writing CMR or not
                     // write CMR byte