diff --git a/Android.mk b/Android.mk
index 7c498da..39d9305 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,5 @@
+ifneq ($(TARGET_USES_AOSP),true)
+
 ifeq ($(BOARD_HAVE_QCOM_FM),true)
 ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
 LOCAL_PATH:= $(call my-dir)
@@ -20,3 +22,5 @@
 include $(LOCAL_PATH)/FMRecord/Android.mk
 endif # is-vendor-board-platform
 endif # BOARD_HAVE_QCOM_FM
+
+endif # Not (TARGET_USES_AOSP)
diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index fb8ab23..e13d864 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -2315,7 +2315,7 @@
                                                 "SleepUpdateThread");
       }
       /* If the thread state is "new" then the thread has not yet started */
-      if(mSleepUpdateHandlerThread.getState() == Thread.State.NEW && isFmOn()) {
+      if(mSleepUpdateHandlerThread.getState() != Thread.State.TERMINATED && isFmOn()) {
           try {
               if((mService != null) &&
                  !mService.isSleepTimerActive()) {