commit b7f96c233f8e36e36b56fd891870f1fb674b8414
author Service qcabuildsw <qcabuildsw@localhost> Wed Oct 26 10:33:19 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Oct 26 10:33:19 2016 -0700
tree 19f2963d45ef9de5d88b9785fe54854f4c90daa9
parent 38c637e54740b8144803d6cab0d1270371f973c1
parent 637aa08ffd14e60d01832af2aa0d2076864aa237

Merge "Check for antenna connected on activity restart" into fm.lnx.2.1-dev

fmapp2/src/com/caf/fmradio/FMRadio.java

diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index 43fd2ef..7d357f7 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -439,7 +439,7 @@
    public void onRestart() {
       Log.d(LOGTAG, "FMRadio: onRestart");
       try {
-         if (null != mService) {
+         if (null != mService && isAntennaAvailable()) {
               mService.requestFocus();
          }
       } catch (Exception e) {
@@ -505,6 +505,9 @@
 
       super.onResume();
 
+      if (!isAntennaAvailable()) {
+          return;
+      }
       // TODO: We should return on exception or continue?
       try {
           if (mService != null)