Skip to content
Snippets Groups Projects
Commit d9feeb26 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "FM: Disable search by PTY"

parents 6a41860c cabfc592
Branches
No related tags found
No related merge requests found
...@@ -269,6 +269,7 @@ public class FMRadio extends Activity ...@@ -269,6 +269,7 @@ public class FMRadio extends Activity
public static boolean mUpdatePickerValue = false; public static boolean mUpdatePickerValue = false;
private LoadedDataAndState SavedDataAndState = null; private LoadedDataAndState SavedDataAndState = null;
private static String mBTsoc = "invalid";
/** fm stats property string */ /** fm stats property string */
public static final String FM_STATS_PROP = "persist.fm.stats"; public static final String FM_STATS_PROP = "persist.fm.stats";
...@@ -387,6 +388,7 @@ public class FMRadio extends Activity ...@@ -387,6 +388,7 @@ public class FMRadio extends Activity
if ((mERadioTextScroller == null) && (mERadioTextTV != null)) { if ((mERadioTextScroller == null) && (mERadioTextTV != null)) {
mERadioTextScroller = new ScrollerText(mERadioTextTV); mERadioTextScroller = new ScrollerText(mERadioTextTV);
} }
mBTsoc = SystemProperties.get("qcom.bluetooth.soc");
} }
protected void setDisplayvalue(){ protected void setDisplayvalue(){
...@@ -697,7 +699,12 @@ public class FMRadio extends Activity ...@@ -697,7 +699,12 @@ public class FMRadio extends Activity
startActivity(launchFMStatIntent); startActivity(launchFMStatIntent);
return true; return true;
case MENU_SCAN_START: case MENU_SCAN_START:
if (mBTsoc.equals("rome")) {
clearStationList();
initiateSearch(0); // 0 - All stations
} else {
showDialog(DIALOG_SEARCH); showDialog(DIALOG_SEARCH);
}
return true; return true;
case MENU_SCAN_STOP: case MENU_SCAN_STOP:
cancelSearch(); cancelSearch();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment