From e1a4ab0cc71ebfbea1ecf16d9d7a4f048acdcd22 Mon Sep 17 00:00:00 2001
From: Mingbo Zhang <mingboz@codeaurora.org>
Date: Mon, 21 Mar 2016 10:28:18 +0800
Subject: [PATCH] Fix null pointer exception in FMRadioService
CRs-Fixed: 992487
Change-Id: Iba131108d2b358678e4894dfedfbbf9d784c8217
---
fmapp2/src/com/caf/fmradio/FMRadioService.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 9afd671..a4fce5d 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -967,7 +967,8 @@ public class FMRadioService extends Service
if (isFmOn() && getResources()
.getBoolean(R.bool.def_headset_next_enabled)) {
try {
- mCallbacks.onSeekNextStation();
+ if ((mServiceInUse) && (mCallbacks != null))
+ mCallbacks.onSeekNextStation();
}catch (RemoteException e) {
}
}
@@ -1066,7 +1067,8 @@ public class FMRadioService extends Service
mPlaybackInProgress = true;
configureAudioDataPath(true);
try {
- mCallbacks.onFmAudioPathStarted();
+ if ((mServiceInUse) && (mCallbacks != null))
+ mCallbacks.onFmAudioPathStarted();
} catch(RemoteException e) {
e.printStackTrace();
}
@@ -1077,7 +1079,8 @@ public class FMRadioService extends Service
configureAudioDataPath(false);
mPlaybackInProgress = false;
try {
- mCallbacks.onFmAudioPathStopped();
+ if ((mServiceInUse) && (mCallbacks != null))
+ mCallbacks.onFmAudioPathStopped();
} catch(RemoteException e) {
e.printStackTrace();
}
--
GitLab