commit 2b1781ca5b5f3bff35f677a9a4487180bad72586
author Linux Build Service Account <lnxbuild@localhost> Wed Sep 14 20:00:14 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 14 20:00:14 2016 -0700
tree 1bf6e5518b841d5a4c747639a7c251e4f0c32427
parent 5429d3640d5a26da742f2f17473978eaa15151b5
parent 9a2f237246a743e5cec0eabe7d0027721aa97b2f

Merge "FM: FMRadio will wait for the focus from telecom repeatedly" into fm.lnx.2.1-dev

fmapp2/src/com/caf/hc_utils/FrequencyPicker.java

diff --git a/fmapp2/src/com/caf/hc_utils/FrequencyPicker.java b/fmapp2/src/com/caf/hc_utils/FrequencyPicker.java
index 519b530..466cc0e 100644
--- a/fmapp2/src/com/caf/hc_utils/FrequencyPicker.java
+++ b/fmapp2/src/com/caf/hc_utils/FrequencyPicker.java
@@ -32,6 +32,7 @@
 import com.caf.fmradio.R;
 import android.widget.NumberPicker;
 import android.widget.NumberPicker.OnValueChangeListener;
+import android.graphics.Color;
 /**
  * A view for selecting the frequency
  *
@@ -85,6 +86,7 @@
         mMHzPicker = (NumberPicker) findViewById(R.id.mhz);
         if (mMHzPicker != null) {
            mMHzPicker.setOnLongPressUpdateInterval(100);
+           mMHzPicker.setBackgroundColor(Color.WHITE);
 
            mMHzPicker.setOnValueChangedListener(new OnValueChangeListener() {
               public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
@@ -100,6 +102,7 @@
         mKHzPicker = (NumberPicker) findViewById(R.id.khz);
         if (mKHzPicker != null) {
            mKHzPicker.setOnLongPressUpdateInterval(100);
+           mKHzPicker.setBackgroundColor(Color.WHITE);
            mKHzPicker.setOnValueChangedListener(new OnValueChangeListener() {
               public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
                   mKhz = newVal;

helium/radio_helium_hal.c

diff --git a/helium/radio_helium_hal.c b/helium/radio_helium_hal.c
index 4d02987..733c0a5 100644
--- a/helium/radio_helium_hal.c
+++ b/helium/radio_helium_hal.c
@@ -40,7 +40,7 @@
 
 int hci_fm_get_signal_threshold();
 int hci_fm_enable_recv_req();
-int hci_fm_mute_mode_req(struct hci_fm_mute_mode_req );
+int hci_fm_mute_mode_req(struct hci_fm_mute_mode_req *);
 static int oda_agt;
 static int grp_mask;
 static int rt_plus_carrier = -1;
@@ -1207,9 +1207,9 @@
     case HCI_FM_HELIUM_AUDIO_MUTE:
         saved_val = hal->radio->mute_mode.hard_mute;
         hal->radio->mute_mode.hard_mute = val;
-        ret = hci_fm_mute_mode_req(hal->radio->mute_mode);
+        ret = hci_fm_mute_mode_req(&hal->radio->mute_mode);
         if (ret < 0) {
-            ALOGE("%s:Error while set FM hard mute %d", LOG_TAG, ret);
+            ALOGE("%s:Error while set FM hard mute :%d", LOG_TAG, ret);
             hal->radio->mute_mode.hard_mute = saved_val;
         }
         break;
@@ -1633,6 +1633,9 @@
     case HCI_FM_HELIUM_LOWER_BAND:
         val = hal->radio->recv_conf.band_low_limit;
         break;
+    case HCI_FM_HELIUM_AUDIO_MUTE:
+        val = hal->radio->mute_mode.hard_mute;
+        return val;
     case HCI_FM_HELIUM_SINR_SAMPLES:
         set_bit(ch_det_th_mask_flag, CMD_CHDET_SINR_SAMPLE);
         ret = hci_fm_get_ch_det_th();