Fixing crash seen on FM radio.

Crash is due a NullPointerException while accessing mService.
Added null checks before accessing mService reference.

YAM-294

Change-Id: Ie5039343dcda55159398a1a52ee4bb2e8748c227
(cherry picked from commit 2ca94376a013fdde934d5ec3e2d1d74e31764f84)

1 files changed, 10 insertions, 6 deletions

diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index d685ffb..209f88a 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -627,7 +627,8 @@ public class FMRadio extends Activity
       boolean sleepActive = isSleepTimerActive();
       boolean searchActive = false;
       try{
-          searchActive = isScanActive() || mService.isSeekActive();
+          searchActive = isScanActive() ||
+              (mService != null && mService.isSeekActive());
       } catch(RemoteException e) {
           e.printStackTrace();
       }
@@ -688,7 +689,8 @@ public class FMRadio extends Activity
       boolean searchActive = false;
 
       try {
-          searchActive = isScanActive() || mService.isSeekActive();
+          searchActive = isScanActive() ||
+              (mService != null && mService.isSeekActive());
       } catch(RemoteException e) {
           e.printStackTrace();
       }
@@ -1214,7 +1216,7 @@ public class FMRadio extends Activity
       boolean isSeekActive = false;
 
       try {
-          isSeekActive = mService.isSeekActive();
+          isSeekActive = (mService != null && mService.isSeekActive());
       } catch(RemoteException e) {
          e.printStackTrace();
       }
@@ -2062,7 +2064,9 @@ public class FMRadio extends Activity
    private void updateSearchProgress() {
       boolean searchActive = false;
       try {
-          searchActive = isScanActive() || mService.isSeekActive() || isSearchActive();
+          searchActive = isScanActive() ||
+              (mService != null && mService.isSeekActive()) ||
+              isSearchActive();
       } catch(RemoteException e) {
          e.printStackTrace();
       }
@@ -2087,7 +2091,7 @@ public class FMRadio extends Activity
    private void saveStations() {
        List<Integer> scannedFrequencies = null;
        try {
-           scannedFrequencies = mService.getScannedFrequencies();
+           scannedFrequencies = (mService != null ? mService.getScannedFrequencies() : null);
        } catch (RemoteException e) {
            e.printStackTrace();
        }
@@ -3119,7 +3123,7 @@ public class FMRadio extends Activity
          if (mIsScaning) {
              List<Integer> scannedFrequencies = null;
              try {
-                 scannedFrequencies = mService.getScannedFrequencies();
+                 scannedFrequencies = (mService != null ? mService.getScannedFrequencies() : null);
              } catch (RemoteException e) {
                  e.printStackTrace();
              }