Revert "FMRadio : Unbind/Rebind in onPause/onResume"

This reverts commit 6750b209b9f28b27ca4a57e7e1e8d83ebc67d534.

Change-Id: If3239d9fcd0a11a0edd3f1ad46d6b53dbae938bb

1 files changed, 52 insertions, 41 deletions

diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index fc411a2..0e45809 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -469,49 +469,17 @@ public class FMRadio extends Activity
    }
 
    @Override
-   protected void onPause() {
-      Log.d(LOGTAG, "FMRadio: onPause");
-      super.onPause();
-      mRadioTextScroller.stopScroll();
-      mERadioTextScroller.stopScroll();
-      FmSharedPreferences.setTunedFrequency(mTunedStation.getFrequency());
-      mPrefs.Save();
-
-      mHandler.removeCallbacksAndMessages(null);
-      cleanupTimeoutHandler();
-      if(mProgressDialog != null) {
-         mProgressDialog.dismiss();
-      }
-      if(mSearchProgressHandler != null) {
-         mSearchProgressHandler.removeCallbacksAndMessages(null);
-      }
-      removeDialog(DIALOG_PRESET_OPTIONS);
-      unRegisterReceiver();
-      if (mService != null) {
-          try {
-               if(!mService.isFmOn()) {
-                  endSleepTimer();
-               }
-          }catch (RemoteException e) {
-               e.printStackTrace();
-          }
-      }
-      unbindFromService(this);
-      mService = null;
-   }
-
-   @Override
-   public void onResume() {
-      super.onResume();
-
+   public void onStart() {
+      super.onStart();
+      Log.d(LOGTAG, "FMRadio: onStart");
       if (isHdmiOn()) {
           showDialog(DIALOG_CMD_FAILED_HDMI_ON);
       }
       else {
          if ((mService == null ) && (false == bindToService(this, osc))) {
-             Log.d(LOGTAG, "onResume: Failed to Start Service");
+             Log.d(LOGTAG, "onStart: Failed to Start Service");
          } else {
-             Log.d(LOGTAG, "onResume: Start Service completed successfully");
+             Log.d(LOGTAG, "onStart: Start Service completed successfully");
          }
          registerFMSettingListner();
       }
@@ -525,6 +493,21 @@ public class FMRadio extends Activity
           mTunedStation.Copy(station);
       }
 
+   }
+
+   @Override
+   protected void onPause() {
+      Log.d(LOGTAG, "FMRadio: onPause");
+      super.onPause();
+      mRadioTextScroller.stopScroll();
+      mERadioTextScroller.stopScroll();
+      FmSharedPreferences.setTunedFrequency(mTunedStation.getFrequency());
+      mPrefs.Save();
+   }
+
+   @Override
+   public void onResume() {
+      super.onResume();
       try {
          if(mService != null) {
             mService.registerCallbacks(mServiceCallbacks);
@@ -589,6 +572,34 @@ public class FMRadio extends Activity
    }
 
    @Override
+   public void onDestroy() {
+      super.onDestroy();
+      Log.d(LOGTAG, "FMRadio: onDestroy");
+      mHandler.removeCallbacksAndMessages(null);
+      cleanupTimeoutHandler();
+      if(mProgressDialog != null) {
+         mProgressDialog.dismiss();
+      }
+      if(mSearchProgressHandler != null) {
+         mSearchProgressHandler.removeCallbacksAndMessages(null);
+      }
+      removeDialog(DIALOG_PRESET_OPTIONS);
+      unRegisterReceiver(mFmSettingReceiver);
+      if (mService != null) {
+          try {
+               if(!mService.isFmOn()) {
+                  endSleepTimer();
+               }
+          }catch (RemoteException e) {
+               e.printStackTrace();
+          }
+      }
+      unbindFromService(this);
+      mService = null;
+      Log.d(LOGTAG, "onDestroy: unbindFromService completed");
+   }
+
+   @Override
    public boolean onCreateOptionsMenu(Menu menu) {
       super.onCreateOptionsMenu(menu);
       MenuItem item;
@@ -3115,10 +3126,10 @@ public class FMRadio extends Activity
         }
     }
 
-    private void unRegisterReceiver() {
-        if(mFmSettingReceiver != null) {
-           unregisterReceiver(mFmSettingReceiver);
-           mFmSettingReceiver = null;
+    private void unRegisterReceiver(BroadcastReceiver myReceiver) {
+        if(myReceiver != null) {
+           unregisterReceiver(myReceiver);
+           myReceiver = null;
         }
     }
 }