summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/audio_hw.c3
-rw-r--r--audio/audio_policy.conf2
-rw-r--r--device.mk6
-rwxr-xr-xinit.tuna.rc9
-rw-r--r--media_codecs.xml1
-rw-r--r--power/power_tuna.c11
6 files changed, 21 insertions, 11 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 66a6da7..c5f1867 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -1341,7 +1341,8 @@ static void select_input_device(struct tuna_audio_device *adev)
/* Select front end */
- if ((adev->active_input != 0) && (adev->active_input->aux_channels)) {
+ if ((adev->active_input != 0) && (adev->active_input->aux_channels ||
+ adev->active_input->main_channels == AUDIO_CHANNEL_IN_FRONT_BACK)) {
ALOGV("select input device(): multi-mic configuration main mic %s sub mic %s",
main_mic_on ? "ON" : "OFF", sub_mic_on ? "ON" : "OFF");
if (main_mic_on) {
diff --git a/audio/audio_policy.conf b/audio/audio_policy.conf
index 1012c26..bf387a2 100644
--- a/audio/audio_policy.conf
+++ b/audio/audio_policy.conf
@@ -47,7 +47,7 @@ audio_hw_modules {
inputs {
primary {
sampling_rates 8000|11025|16000|22050|24000|32000|44100|48000
- channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO
+ channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK
formats AUDIO_FORMAT_PCM_16_BIT
devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BACK_MIC
}
diff --git a/device.mk b/device.mk
index c4f09c4..32e78f0 100644
--- a/device.mk
+++ b/device.mk
@@ -49,6 +49,12 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
power.tuna
+# Support for Browser's saved page feature. This allows
+# for pages saved on previous versions of the OS to be
+# viewed on the current OS.
+PRODUCT_PACKAGES += \
+ libskia_legacy
+
# Audio
PRODUCT_PACKAGES += \
audio.primary.tuna \
diff --git a/init.tuna.rc b/init.tuna.rc
index c5016d5..c171667 100755
--- a/init.tuna.rc
+++ b/init.tuna.rc
@@ -193,7 +193,7 @@ service dhcpcd_p2p /system/bin/dhcpcd -aABKL
disabled
oneshot
-service dhcpcd_bnep0 /system/bin/dhcpcd -ABKL
+service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL
class main
disabled
oneshot
@@ -213,7 +213,12 @@ service iprenew_p2p /system/bin/dhcpcd -n
disabled
oneshot
-service iprenew_bnep0 /system/bin/dhcpcd -n
+service iprenew_bt-pan /system/bin/dhcpcd -n
+ class main
+ disabled
+ oneshot
+
+service iprenew_eth0 /system/bin/dhcpcd -n
class main
disabled
oneshot
diff --git a/media_codecs.xml b/media_codecs.xml
index 4ac9123..87d02de 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -92,6 +92,7 @@ Only the three quirks included above are recognized at this point:
<MediaCodec name="OMX.google.g711.alaw.decoder" type="audio/g711-alaw" />
<MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw" />
<MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" />
+ <MediaCodec name="OMX.google.gsm.decoder" type="audio/gsm" />
<MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
<MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" />
diff --git a/power/power_tuna.c b/power/power_tuna.c
index 7d06093..bca0ed2 100644
--- a/power/power_tuna.c
+++ b/power/power_tuna.c
@@ -57,21 +57,18 @@ static void sysfs_write(char *path, char *s)
static void tuna_power_init(struct power_module *module)
{
- /*
- * cpufreq interactive governor: timer 20ms, min sample 60ms,
- * hispeed 700MHz at load 50%.
- */
-
sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/timer_rate",
"20000");
sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/min_sample_time",
"60000");
sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/hispeed_freq",
"700000");
+ sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/target_loads",
+ "70 920000:80 1200000:99");
sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load",
- "50");
+ "99");
sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay",
- "100000");
+ "80000");
}
static int boostpulse_open(struct tuna_power_module *tuna)