commit d4ee916376c1e2e72f3e402762f0114f405675fd
author Linux Build Service Account <lnxbuild@localhost> Tue Jan 08 17:14:07 2019 -0800
committer Linux Build Service Account <lnxbuild@localhost> Tue Jan 08 17:14:07 2019 -0800
tree fbbe091f420a60faef3fb011ea768dc2a8ff8712
parent c9059b1538d1ebd4b87e3db06949dc47ddfbf542
parent be1ab4154689cc6f2f0431f9208a1817529083dc

Merge be1ab4154689cc6f2f0431f9208a1817529083dc on remote branch

Change-Id: Ia2c20ad57b6426d4ff8ec611a70296ec0102d284

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

diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 6c35b80..0ef3a1b 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -119,6 +119,7 @@
    private static final String LOGTAG = "FMService";//FMRadio.LOGTAG;
 
    private FmReceiver mReceiver;
+   private final Object mReceiverLock = new Object();
    private BroadcastReceiver mHeadsetReceiver = null;
    private BroadcastReceiver mSdcardUnmountReceiver = null;
    private BroadcastReceiver mMusicCommandListener = null;
@@ -1647,8 +1648,10 @@
           Context context = getApplicationContext();
           NotificationManager notificationManager =
               (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-
-          notificationManager.deleteNotificationChannel(FMRADIO_NOTIFICATION_CHANNEL);
+          if((notificationManager != null)
+            && (notificationManager.getNotificationChannel(FMRADIO_NOTIFICATION_CHANNEL) != null)) {
+             notificationManager.deleteNotificationChannel(FMRADIO_NOTIFICATION_CHANNEL);
+          }
       }
    }
 
@@ -2396,10 +2399,12 @@
       boolean bStatus=false;
 
       // This will disable the FM radio device
-      if (mReceiver != null)
-      {
-         bStatus = mReceiver.disable(this);
-         mReceiver = null;
+      synchronized(mReceiverLock) {
+         if (mReceiver != null)
+         {
+            bStatus = mReceiver.disable(this);
+            mReceiver = null;
+         }
       }
       fmOperationsOff();
       stop();
@@ -3037,10 +3042,12 @@
    public boolean enableStereo(boolean bEnable)
    {
       boolean bCommandSent=false;
-      if (mReceiver != null)
-      {
-         Log.d(LOGTAG, "enableStereo: " + bEnable);
-         bCommandSent = mReceiver.setStereoMode(bEnable);
+      synchronized(mReceiverLock) {
+          if (mReceiver != null)
+          {
+             Log.d(LOGTAG, "enableStereo: " + bEnable);
+             bCommandSent = mReceiver.setStereoMode(bEnable);
+          }
       }
       return bCommandSent;
    }