Merge 957e5f7cde893885a914a8d51f465d9712ad2988 on remote branch
Change-Id: Ib3f9231f763ea228558b21dc684a21093aeaa292
diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index 54baa12..b378ba1 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -495,6 +495,11 @@
if (isSleepTimerActive()) {
Log.d(LOGTAG, "FMRadio: Sleep Timer active");
mSleepUpdateHandlerThread.interrupt();
+ try {
+ mSleepUpdateHandlerThread.join();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
mRadioTextScroller.stopScroll();
mERadioTextScroller.stopScroll();
@@ -535,6 +540,11 @@
mService.cancelDelayedStop(FMRadioService.STOP_SERVICE);
if(null != mSleepUpdateHandlerThread) {
mSleepUpdateHandlerThread.interrupt();
+ try {
+ mSleepUpdateHandlerThread.join();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
} catch (Exception e) {
e.printStackTrace();
@@ -2310,7 +2320,7 @@
"SleepUpdateThread");
}
/* If the thread state is "new" then the thread has not yet started */
- if(mSleepUpdateHandlerThread.getState() != Thread.State.TERMINATED && isFmOn()) {
+ if(mSleepUpdateHandlerThread.getState() == Thread.State.NEW && isFmOn()) {
try {
if((mService != null) &&
!mService.isSleepTimerActive()) {
@@ -2320,10 +2330,6 @@
FMRadioService.STOP_SERVICE);
}
}
- if (mSleepUpdateHandlerThread.getState() == Thread.State.TERMINATED) {
- mSleepUpdateHandlerThread = new Thread(null, doSleepProcessing,
- "SleepUpdateThread");
- }
mSleepUpdateHandlerThread.start();
}catch(Exception e) {
e.printStackTrace();
@@ -2343,6 +2349,11 @@
if(null != mSleepUpdateHandlerThread) {
mSleepUpdateHandlerThread.interrupt();
+ try {
+ mSleepUpdateHandlerThread.join();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
if(null != mSleepMsgTV) {
mSleepMsgTV.setVisibility(View.INVISIBLE);