commit ed3ee3c1c445ddf5047589dbccc30231e09afbef
author Leo Wang <leozwang@google.com> Thu Jan 15 06:03:53 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 15 06:03:53 2015 +0000
tree 8072c9988080b503dfe12b21c53a21ed76b97705
parent 651d5cdf0b09c66492c0d7695cacecf6a8a4a85a
parent 87171fc8d875e8c32c0cc77913ae06879922a888

Merge "    [FM] Fix 18847131 There is no sound output from BT earphone while BT earphone is connected" into lmp-mr1-dev

src/com/android/fmradio/FmFavoriteActivity.java

diff --git a/src/com/android/fmradio/FmFavoriteActivity.java b/src/com/android/fmradio/FmFavoriteActivity.java
index cdc180b..6abef98 100644
--- a/src/com/android/fmradio/FmFavoriteActivity.java
+++ b/src/com/android/fmradio/FmFavoriteActivity.java
@@ -557,6 +557,7 @@
                 refreshMenuItem(false);
                 mLvFavorites.setEmptyView(mSearchTips);
                 mSearchProgress.setIndeterminate(true);
+                mMyAdapter.swipResult(null);
                 mService.startScanAsync();
             } else {
                 boolean isScan = mService.isScanning();

src/com/android/fmradio/FmRecordActivity.java

diff --git a/src/com/android/fmradio/FmRecordActivity.java b/src/com/android/fmradio/FmRecordActivity.java
index 4df42ec..06e4a8b 100644
--- a/src/com/android/fmradio/FmRecordActivity.java
+++ b/src/com/android/fmradio/FmRecordActivity.java
@@ -251,6 +251,11 @@
         // If have stopped recording, need not show notification
         if (!isStopRecording()) {
             mHandler.sendEmptyMessage(MSG_UPDATE_NOTIFICATION);
+        } else if (isSaveDialogShown()) {
+            // Only when save dialog is shown and FM radio is back to background,
+            // it is necessary to update playing notification.
+            // Otherwise, FmMainActivity will update playing notification.
+            mService.updatePlayingNotification();
         }
     }