summaryrefslogtreecommitdiffstats
path: root/fmapp2
diff options
context:
space:
mode:
authorSatish Kodishala <skodisha@codeaurora.org>2014-09-30 16:28:04 +0530
committerSatish Kodishala <skodisha@codeaurora.org>2014-09-30 16:28:04 +0530
commit5ebf998d5feb8258019051cc91978780dc61cfcd (patch)
tree5ac53c156b0bc8792113d5dec4bc05cdf5d33986 /fmapp2
parent32d2952d701e3bff313132c096c108a69713f463 (diff)
downloadandroid_hardware_qcom_fm-5ebf998d5feb8258019051cc91978780dc61cfcd.tar.gz
android_hardware_qcom_fm-5ebf998d5feb8258019051cc91978780dc61cfcd.tar.bz2
android_hardware_qcom_fm-5ebf998d5feb8258019051cc91978780dc61cfcd.zip
FM: Fix an exception in RT string display
Convert RT data to string while displaying. Removed check for hdmi presence. Change-Id: I5d0788b9e7ade35f884de367f6d329584808bb7d CRs-fixed: 728904
Diffstat (limited to 'fmapp2')
-rw-r--r--fmapp2/src/com/caf/fmradio/FMTransmitterActivity.java27
1 files changed, 6 insertions, 21 deletions
diff --git a/fmapp2/src/com/caf/fmradio/FMTransmitterActivity.java b/fmapp2/src/com/caf/fmradio/FMTransmitterActivity.java
index 9fc2d53..7ae8762 100644
--- a/fmapp2/src/com/caf/fmradio/FMTransmitterActivity.java
+++ b/fmapp2/src/com/caf/fmradio/FMTransmitterActivity.java
@@ -236,17 +236,13 @@ public class FMTransmitterActivity extends Activity {
}
enableRadioOnOffUI(false);
- //HDMI and FM concurrecny is not supported.
- if(isHdmiOn()) {
- showDialog(DIALOG_CMD_FAILED_HDMI_ON);
+
+ if(false == bindToService(this, osc)) {
+ Log.d(LOGTAG, "onCreate: Failed to Start Service");
}else {
- if(false == bindToService(this, osc)) {
- Log.d(LOGTAG, "onCreate: Failed to Start Service");
- }else {
- Log.d(LOGTAG, "onCreate: Start Service completed successfully");
- }
- registerFMSettingListner();
+ Log.d(LOGTAG, "onCreate: Start Service completed successfully");
}
+ registerFMSettingListner();
}
@Override
@@ -464,17 +460,6 @@ public class FMTransmitterActivity extends Activity {
return super.onOptionsItemSelected(item);
}
- private boolean isHdmiOn() {
- //HDMI and FM concurrecny is not supported.
- try {
- String hdmiUserOption = android.provider.Settings.System.getString(
- getContentResolver(), "HDMI_USEROPTION");
- }catch(Exception ex){
- Log.d(LOGTAG,"Get HDMI open failed");
- }
- return false;
- }
-
@Override
protected Dialog onCreateDialog(int id) {
switch (id) {
@@ -1392,7 +1377,7 @@ public class FMTransmitterActivity extends Activity {
void startScroll() {
final TextView textView = mView.get();
if(textView != null) {
- mOriginalString = (String) textView.getText();
+ mOriginalString = (String) textView.getText().toString();
mStringlength = mOriginalString.length();
if(mStringlength > 0) {
mStatus = SCROLLER_STARTING;