Merge 3a5461f375c7ff0a98e07fe5aa892a3de131acca on remote branch

Change-Id: If623c031af5a06dbda70a082ec09b85c6293ad4e
diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 4807355..7ac7eee 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -1239,7 +1239,7 @@
              mRecorder.setAudioSource(MediaRecorder.AudioSource.RADIO_TUNER);
              mRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
              mRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
-             final int samplingRate = 44100;
+             final int samplingRate = 48000;
              mRecorder.setAudioSamplingRate(samplingRate);
              final int bitRate = 128000;
              mRecorder.setAudioEncodingBitRate(bitRate);
diff --git a/fmapp2/src/com/caf/fmradio/FMStats.java b/fmapp2/src/com/caf/fmradio/FMStats.java
index 063326d..b386757 100644
--- a/fmapp2/src/com/caf/fmradio/FMStats.java
+++ b/fmapp2/src/com/caf/fmradio/FMStats.java
@@ -2852,7 +2852,7 @@
 
         String chip = mReceiver.getSocName();
 
-        if (chip.equals("cherokee"))
+        if (chip.equals("cherokee") || chip.equals("evros"))
             return true;
         else
             return false;