commit d9feeb26e7e365ca926acf2bbfe1e5016a52b9a9
author Linux Build Service Account <lnxbuild@localhost> Wed Jul 16 07:51:37 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jul 16 07:51:37 2014 -0700
tree 4b7fd2b25bc7274666b5d47491390bcfbc7ee190
parent 6a41860cb176dedb931cd04d25b91456c138767b
parent cabfc59254d3c8ed45cbbeef6345df290cbb1335

Merge "FM: Disable search by PTY"

fmapp2/src/com/caf/fmradio/FMRadio.java

diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index 0893664..f4ed775 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -269,6 +269,7 @@
    public static boolean mUpdatePickerValue = false;
 
    private LoadedDataAndState SavedDataAndState = null;
+   private static String mBTsoc = "invalid";
 
    /** fm stats property string */
    public static final String FM_STATS_PROP = "persist.fm.stats";
@@ -387,6 +388,7 @@
       if ((mERadioTextScroller == null) && (mERadioTextTV != null)) {
           mERadioTextScroller = new ScrollerText(mERadioTextTV);
       }
+      mBTsoc = SystemProperties.get("qcom.bluetooth.soc");
    }
 
    protected void setDisplayvalue(){
@@ -697,7 +699,12 @@
           startActivity(launchFMStatIntent);
           return true;
       case MENU_SCAN_START:
-         showDialog(DIALOG_SEARCH);
+         if (mBTsoc.equals("rome")) {
+             clearStationList();
+             initiateSearch(0); // 0 - All stations
+         } else {
+             showDialog(DIALOG_SEARCH);
+         }
          return true;
       case MENU_SCAN_STOP:
          cancelSearch();