diff options
| -rw-r--r-- | BoardConfig.mk | 1 | ||||
| -rw-r--r-- | audio/audio_hw.c | 3 | ||||
| -rw-r--r-- | audio/audio_policy.conf | 2 | ||||
| -rw-r--r-- | device.mk | 12 | ||||
| -rw-r--r-- | fstab.tuna | 6 | ||||
| -rwxr-xr-x | init.tuna.rc | 12 | ||||
| -rw-r--r-- | media_codecs.xml | 2 | ||||
| -rw-r--r-- | power/power_tuna.c | 11 |
8 files changed, 31 insertions, 18 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 1e6d96a..45f1bab 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -59,6 +59,7 @@ TARGET_RECOVERY_UI_LIB := librecovery_ui_tuna TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_tuna TARGET_RELEASETOOLS_EXTENSIONS := device/samsung/tuna +TARGET_RECOVERY_FSTAB = device/samsung/tuna/fstab.tuna TARGET_USERIMAGES_USE_EXT4 := true BOARD_SYSTEMIMAGE_PARTITION_SIZE := 685768704 BOARD_USERDATAIMAGE_PARTITION_SIZE := 14539537408 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 } @@ -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 \ @@ -192,12 +198,6 @@ PRODUCT_PACKAGES += \ e2fsck \ setup_fs -# for bugmailer -PRODUCT_PACKAGES += send_bug -PRODUCT_COPY_FILES += \ - system/extras/bugmailer/bugmailer.sh:system/bin/bugmailer.sh \ - system/extras/bugmailer/send_bug:system/bin/send_bug - $(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk) $(call inherit-product-if-exists, vendor/nxp/pn544/nxp-pn544-fw-vendor.mk) @@ -8,4 +8,10 @@ /dev/block/platform/omap/omap_hsmmc.0/by-name/efs /factory ext4 ro wait /dev/block/platform/omap/omap_hsmmc.0/by-name/cache /cache ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check /dev/block/platform/omap/omap_hsmmc.0/by-name/userdata /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check,encryptable=/dev/block/platform/omap/omap_hsmmc.0/by-name/metadata +/dev/block/platform/omap/omap_hsmmc.0/by-name/misc /misc emmc defaults defaults +/dev/block/platform/omap/omap_hsmmc.0/by-name/boot /boot emmc defaults defaults +/dev/block/platform/omap/omap_hsmmc.0/by-name/recovery /recovery emmc defaults defaults +/dev/block/platform/omap/omap_hsmmc.0/by-name/sbl /sbl emmc defaults defaults +/dev/block/platform/omap/omap_hsmmc.0/by-name/xloader /xloader emmc defaults defaults +/dev/block/platform/omap/omap_hsmmc.0/by-name/radio /radio emmc defaults defaults diff --git a/init.tuna.rc b/init.tuna.rc index 791473a..8540f8c 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -208,7 +208,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 @@ -228,13 +228,19 @@ 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 # bugreport is triggered by holding down volume down, volume up and power -service bugreport /system/bin/bugmailer.sh -v +service bugreport /system/bin/dumpstate -d -p -B \ + -o /data/data/com.android.shell/files/bugreports/bugreport class main disabled oneshot diff --git a/media_codecs.xml b/media_codecs.xml index 4ac9123..1f41a31 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" /> @@ -116,5 +117,6 @@ Only the three quirks included above are recognized at this point: <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" /> <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" /> <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" /> + <MediaCodec name="OMX.google.vpx.encoder" type="video/x-vnd.on2.vp8" /> </Encoders> </MediaCodecs> 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) |