commit 944af0b8b6ea2d688529991c5face4b4ea84043d
author Linux Build Service Account <lnxbuild@localhost> Fri Jan 17 08:04:49 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jan 17 08:04:49 2014 -0800
tree 51e76225e57602feb9abc8113101ad6993229808
parent 6d8ed11da4f0ecb929eca06c6c5c5f6294a715ef
parent 19246817eaff7a7606502f102e385109e38305f6

Merge "fmrecord: Use proper media type"

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 ddb556a..0f738c3 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -1071,7 +1071,13 @@
                          mSpeakerDisableHandler.postDelayed(mSpeakerDisableTask, 0);
                       }
                       if (true == mPlaybackInProgress) {
-                          fmOff();
+                          if(mMuted)
+                             unMute();
+                          stopFM();
+                      }
+                      if (mSpeakerPhoneOn) {
+                          if (isAnalogModeSupported())
+                              setAudioPath(false);
                       }
                       mStoppedOnFocusLoss = true;
                       break;

jni/Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 56f7da3..c3b3a42 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -12,8 +12,6 @@
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
-LOCAL_CFLAGS += -include bionic/libc/kernel/arch-arm/asm/posix_types.h
-LOCAL_CFLAGS += -include bionic/libc/kernel/arch-arm/asm/byteorder.h
 LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/types.h
 LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/posix_types.h
 LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/socket.h