commit 66495bdf022078245acf4610a8d8ff28865d7aad
author Linux Build Service Account <lnxbuild@localhost> Fri Dec 20 17:00:53 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Dec 20 17:00:53 2013 -0800
tree 436d11142a19ca3905b447e566cfd6ff1c81be1a
parent 60ca65983863572f25e5da9dc64da457f1c6e424
parent 192e59c1e4a548f7dcd193cad6123ae2133784a2

Merge "fm: removed old FM app"

fmapp/Android.mk

diff --git a/fmapp/Android.mk b/fmapp/Android.mk
index 8692b8c..68569c4 100644
--- a/fmapp/Android.mk
+++ b/fmapp/Android.mk
@@ -10,7 +10,7 @@
         src/com/codeaurora/fmradio/IFMTransmitterService.aidl \
 
 
-ifeq ($(call is-android-codename-in-list,JELLY_BEAN ICECREAM_SANDWICH HONEYCOMB),true)
+ifeq ($(call is-platform-sdk-version-at-least,11),true)
 LOCAL_SRC_FILES +=  $(call all-java-files-under, src/com/codeaurora/hc_utils)
 else
 LOCAL_SRC_FILES +=  $(call all-java-files-under, src/com/codeaurora/utils)

fmapp/src/com/codeaurora/fmradio/FMTransmitterService.java

diff --git a/fmapp/src/com/codeaurora/fmradio/FMTransmitterService.java b/fmapp/src/com/codeaurora/fmradio/FMTransmitterService.java
index e599e8d..d4c953c 100644
--- a/fmapp/src/com/codeaurora/fmradio/FMTransmitterService.java
+++ b/fmapp/src/com/codeaurora/fmradio/FMTransmitterService.java
@@ -1161,6 +1161,10 @@
         public void setCurrentClientId(int clientGeneration, PendingIntent clientMediaIntent,
                 boolean clearing) {
         }
+
+        @Override
+        public void setEnabled(boolean enabled) {
+        }
    }
 
    class Metadata {

fmapp2/Android.mk

diff --git a/fmapp2/Android.mk b/fmapp2/Android.mk
index 3985572..47c8a1b 100644
--- a/fmapp2/Android.mk
+++ b/fmapp2/Android.mk
@@ -4,13 +4,13 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src/com/caf/fmradio) \
-	src/com/caf/fmradio/IFMRadioServiceCallbacks.aidl \
-	src/com/caf/fmradio/IFMRadioService.aidl \
-	src/com/caf/fmradio/IFMTransmitterServiceCallbacks.aidl \
-	src/com/caf/fmradio/IFMTransmitterService.aidl \
+        src/com/caf/fmradio/IFMRadioServiceCallbacks.aidl \
+        src/com/caf/fmradio/IFMRadioService.aidl \
+        src/com/caf/fmradio/IFMTransmitterServiceCallbacks.aidl \
+        src/com/caf/fmradio/IFMTransmitterService.aidl \
 
 
-ifeq ($(call is-android-codename-in-list,JELLY_BEAN ICECREAM_SANDWICH HONEYCOMB),true)
+ifeq ($(call is-platform-sdk-version-at-least,11),true)
 LOCAL_SRC_FILES +=  $(call all-java-files-under, src/com/caf/hc_utils)
 else
 LOCAL_SRC_FILES +=  $(call all-java-files-under, src/com/caf/utils)

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

diff --git a/fmapp2/src/com/caf/fmradio/FMTransmitterService.java b/fmapp2/src/com/caf/fmradio/FMTransmitterService.java
index a720868..057eca5 100644
--- a/fmapp2/src/com/caf/fmradio/FMTransmitterService.java
+++ b/fmapp2/src/com/caf/fmradio/FMTransmitterService.java
@@ -1159,6 +1159,11 @@
         public void setCurrentClientId(int clientGeneration, PendingIntent clientMediaIntent,
                 boolean clearing) {
         }
+
+        @Override
+        public void setEnabled(boolean enabled) {
+        }
+
    }
 
    class Metadata {