Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31fe68d9 authored by Benson Huang's avatar Benson Huang Committed by Nicholas Sauer
Browse files

[FM] Recording name is saved abnormally after discarding it in FM 

Launch FM and play a channel without a name -> Start recording
-> Stop recording and discard it -> Reboot the device -> Check
the recording name in Play Music, FM recording named as "MMddyyyy_hhmmss"
displays in Play Music.

The fix is to delete FM recording file when discarding.

Bug 19059404
from: https://partner-android-review.googlesource.com/#/c/193717/



Change-Id: I37fa949c108af175131fd08d0bbac66ef1cf4daf
Signed-off-by: default avatarBenson Huang <benson.huang@mediatek.com>
parent e35b6c7d

src/com/android/fmradio/FmRecordActivity.java

+4 −3
Original line number Diff line number Diff line
@@ -505,13 +505,14 @@ public class FmRecordActivity extends Activity implements 
        }

        String sdcard = FmService.getRecordingSdcard();

        String recordingName = mService.getRecordingName();

        String saveName = null;

        if (TextUtils.isEmpty(mStationName.getText())) {

            recordingName = FmRecorder.RECORDING_FILE_PREFIX +  "_" + recordingName;

            saveName = FmRecorder.RECORDING_FILE_PREFIX +  "_" + recordingName;

        } else {

            recordingName = FmRecorder.RECORDING_FILE_PREFIX + "_" + mStationName.getText() + "_"

            saveName = FmRecorder.RECORDING_FILE_PREFIX + "_" + mStationName.getText() + "_"

                    + recordingName;

        }

        FmSaveDialog newFragment = new FmSaveDialog(sdcard, recordingName, recordingName);

        FmSaveDialog newFragment = new FmSaveDialog(sdcard, recordingName, saveName);

        newFragment.show(mFragmentManager, TAG_SAVE_RECORDINGD);

        mFragmentManager.executePendingTransactions();

        mHandler.removeMessages(FmListener.MSGID_REFRESH);

src/com/android/fmradio/dialogs/FmSaveDialog.java

+11 −2
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ public class FmSaveDialog extends DialogFragment { 


    private String mRecordingFileName = null;



    private String mTempRecordingName = null;



    /**

     * FM record dialog fragment, because fragment manager need empty

     * constructor to instantiated this dialog fragment when configuration
@@ -79,7 +81,8 @@ public class FmSaveDialog extends DialogFragment { 
     */

    public FmSaveDialog(String sdcard, String defaultName, String recordingName) {

        mRecordingSdcard = sdcard;

        mDefaultRecordingName = defaultName;

        mTempRecordingName = defaultName + FmRecorder.RECORDING_FILE_EXTENSION;

        mDefaultRecordingName = recordingName;

        mRecordingNameToSave = recordingName;

    }
@@ -205,12 +208,13 @@ public class FmSaveDialog extends DialogFragment { 
        @Override

        public void onClick(View v) {



            File recordingFolderPath = new File(mRecordingSdcard, "FM Recording");



            switch (v.getId()) {

                case R.id.save_dialog_button_save:

                String msg = null;

                // Check the recording name whether exist

                mRecordingNameToSave = mRecordingNameEditText.getText().toString().trim();

                File recordingFolderPath = new File(mRecordingSdcard, "FM Recording");

                File recordingFileToSave = new File(recordingFolderPath, mRecordingNameToSave

                                + FmRecorder.RECORDING_FILE_EXTENSION);
@@ -234,6 +238,11 @@ public class FmSaveDialog extends DialogFragment { 


                case R.id.save_dialog_button_discard:

                    dismissAllowingStateLoss();

                    // here need delete discarded recording file

                    File needToDelete = new File(recordingFolderPath, mTempRecordingName);

                    if (needToDelete.exists()) {

                        needToDelete.delete();

                    }

                    break;



                default: