From dc76ad071b60c6c8d298c3aba92b8a7dfe5bf25e Mon Sep 17 00:00:00 2001
From: Benson Huang <benson.huang@mediatek.com>
Date: Wed, 17 Dec 2014 18:33:04 +0800
Subject: [PATCH]     [FM] FM default name of recording file is not correct

    Launch FM, play a channel without a name or PS info ->
    Select "Start Recording" in options menu -> Tap "STOP
    RECORDINGS" and check the default name, It is
    "FM__MMddyyyy_hhmmss".

    The fix is to change recordingName according to different
    condition.

    Bug 18780825

    Review: https://partner-android-review.git.corp.google.com/#/c/189540

    Signed-off-by: Benson Huang <benson.huang@mediatek.com>

Change-Id: I75a3565f689f552e4965ede900f07f68749ed736
---
 src/com/android/fmradio/FmRecordActivity.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/android/fmradio/FmRecordActivity.java b/src/com/android/fmradio/FmRecordActivity.java
index bbbf6bf..7565538 100644
--- a/src/com/android/fmradio/FmRecordActivity.java
+++ b/src/com/android/fmradio/FmRecordActivity.java
@@ -454,8 +454,12 @@ public class FmRecordActivity extends Activity implements
         }
         String sdcard = FmService.getRecordingSdcard();
         String recordingName = mService.getRecordingName();
-        recordingName = FmRecorder.RECORDING_FILE_PREFIX + "_" + mStationName.getText() + "_"
-                + recordingName;
+        if (TextUtils.isEmpty(mStationName.getText())) {
+            recordingName = FmRecorder.RECORDING_FILE_PREFIX +  "_" + recordingName;
+        } else {
+            recordingName = FmRecorder.RECORDING_FILE_PREFIX + "_" + mStationName.getText() + "_"
+                    + recordingName;
+        }
         FmSaveDialog newFragment = new FmSaveDialog(sdcard, recordingName, recordingName);
         newFragment.show(mFragmentManager, TAG_SAVE_RECORDINGD);
         mFragmentManager.executePendingTransactions();
-- 
GitLab