Merge branch 'gingerbread' into gingerbread-release

5 files changed, 12 insertions, 22 deletions

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 5d24448..0c9c31b 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -53,4 +53,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/SHARED_LIBRAR
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/SHARED_LIBRARIES/libaudio_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/STATIC_LIBRARIES/libasound_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/EXECUTABLES/alsa_*)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/system/bin/alsa_*)
\ No newline at end of file
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/system/bin/alsa_*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/system/etc/asound.conf)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/system/usr/share/alsa)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/PACKAGING/systemimage_intermediates)
diff --git a/bcm4329.ko b/bcm4329.ko
index fd12ec6..8a2b27d 100644
--- a/bcm4329.ko
+++ b/bcm4329.ko
diff --git a/device.mk b/device.mk
index 532bd6f..34d4c37 100644
--- a/device.mk
+++ b/device.mk
@@ -43,7 +43,6 @@ DEVICE_PACKAGE_OVERLAYS := device/samsung/crespo/overlay
 
 # These are the hardware-specific configuration files
 PRODUCT_COPY_FILES := \
-	device/samsung/crespo/asound.conf:system/etc/asound.conf \
 	device/samsung/crespo/vold.fstab:system/etc/vold.fstab \
 	device/samsung/crespo/egl.cfg:system/lib/egl/egl.cfg
 
@@ -70,26 +69,6 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_CHARACTERISTICS := nosdcard
 
-# ALSA configuration files
-PRODUCT_COPY_FILES += \
-	device/samsung/crespo/alsa-lib/src/conf/alsa.conf:system/usr/share/alsa/alsa.conf \
-	device/samsung/crespo/alsa-lib/src/conf/cards/aliases.conf:system/usr/share/alsa/cards/aliases.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/center_lfe.conf:system/usr/share/alsa/pcm/center_lfe.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/default.conf:system/usr/share/alsa/pcm/default.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/dmix.conf:system/usr/share/alsa/pcm/dmix.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/dpl.conf:system/usr/share/alsa/pcm/dpl.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/dsnoop.conf:system/usr/share/alsa/pcm/dsnoop.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/front.conf:system/usr/share/alsa/pcm/front.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/iec958.conf:system/usr/share/alsa/pcm/iec958.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/modem.conf:system/usr/share/alsa/pcm/modem.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/rear.conf:system/usr/share/alsa/pcm/rear.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/side.conf:system/usr/share/alsa/pcm/side.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/surround40.conf:system/usr/share/alsa/pcm/surround40.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/surround41.conf:system/usr/share/alsa/pcm/surround41.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/surround50.conf:system/usr/share/alsa/pcm/surround50.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/surround51.conf:system/usr/share/alsa/pcm/surround51.conf \
-	device/samsung/crespo/alsa-lib/src/conf/pcm/surround71.conf:system/usr/share/alsa/pcm/surround71.conf
-
 # These are the OpenMAX IL configuration files
 PRODUCT_COPY_FILES += \
 	device/samsung/crespo/sec_mm/sec_omx/sec_omx_core/secomxregistry:system/etc/secomxregistry \
diff --git a/kernel b/kernel
index 24b51af..f7c1bfa 100644
--- a/kernel
+++ b/kernel
diff --git a/libaudio2/AudioHardware.cpp b/libaudio2/AudioHardware.cpp
index 3755e23..10409a1 100644
--- a/libaudio2/AudioHardware.cpp
+++ b/libaudio2/AudioHardware.cpp
@@ -28,6 +28,7 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/resource.h>
 #include <dlfcn.h>
 #include <fcntl.h>
 
@@ -311,8 +312,13 @@ status_t AudioHardware::setMode(int mode)
     sp<AudioStreamInALSA> spIn;
     status_t status;
 
+    // bump thread priority to speed up mutex acquisition
+    int  priority = getpriority(PRIO_PROCESS, 0);
+    setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_URGENT_AUDIO);
+
     // Mutex acquisition order is always out -> in -> hw
     AutoMutex lock(mLock);
+
     spOut = mOutput;
     while (spOut != 0) {
         if (!spOut->checkStandby()) {
@@ -349,6 +355,8 @@ status_t AudioHardware::setMode(int mode)
     }
     // spIn is not 0 here only if the input is active
 
+    setpriority(PRIO_PROCESS, 0, priority);
+
     int prevMode = mMode;
     status = AudioHardwareBase::setMode(mode);
     LOGV("setMode() : new %d, old %d", mMode, prevMode);