From 9de9cad929fbcf50aed0eedac8e54208f1f306a4 Mon Sep 17 00:00:00 2001 From: Erik Gilling Date: Fri, 9 Mar 2012 12:46:33 -0800 Subject: new kernel prebuilt includes: 2c7c24b Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 14d4f82 Merge branch 'linux-omap-3.0' into android-omap-3.0 76e33c3 gpu: pvr: Update to DDK 1.8@840215 78149c2 gpu: pvr: Update to DDK 1.8@813213 Change-Id: I441bc22442b4095364d4b60a37a1490f2cd16928 Signed-off-by: Erik Gilling --- kernel | Bin 4072980 -> 4073268 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 21e5f05..3c5c6fe 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 764ea44f49cf5b882f8c360c3a6ae35f01fe7bec Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Thu, 29 Mar 2012 12:56:08 -0700 Subject: tuna: kernel prebuilt c6aff6c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 64493d1 ARM: omap: tuna: Add CONFIG_DHD_ENABLE_P2P option a1d5de5 Merge branch 'android-3.0' into android-omap-3.0 f764be6 net: wireless: bcmdhd: Fix crash in dhd_preinit_ioctls() band set 54ba9e6 net: wireless: bcmdhd: Add CONFIG_DHD_ENABLE_P2P Kconfig option Change-Id: Ifb48b0a63ac3467cc4918976a8f9b9af7c2ff508 Signed-off-by: Dmitry Shmidt --- kernel | Bin 4117888 -> 4117692 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 593dd2b..4e5bf56 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From b74801dc22bb4945ddf79b2e12e6328a862d68c3 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Tue, 3 Apr 2012 17:29:15 -0700 Subject: Remove keystore.tuna.so from product build The driver has a power usage bug, so remove this from the device build for now. Bug: 6277753 Change-Id: Iaa27eaafc3764fb91cd2055028979c8ea74f035f --- CleanSpec.mk | 1 + device.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index cff019a..51b1305 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -50,3 +50,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/phone_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/updatecmds/migrate_nfc.txt) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/keystore.tuna.so) diff --git a/device.mk b/device.mk index 8db5e82..f6e49e6 100644 --- a/device.mk +++ b/device.mk @@ -58,8 +58,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ tuna_hdcp_keys -PRODUCT_PACKAGES += \ - keystore.tuna +#PRODUCT_PACKAGES += \ +# keystore.tuna PRODUCT_COPY_FILES += \ $(LOCAL_KERNEL):kernel \ -- cgit v1.1 From cb8ba82ffae8de8c16328e2e26bef9599213f096 Mon Sep 17 00:00:00 2001 From: Benoit Goby Date: Fri, 13 Apr 2012 14:52:05 -0700 Subject: tuna: prebuilt kernel (locally built) 65047b2 misc: modem_if: modemcontrol: add cp_dump pin level when cp crash f0dcaa91 OMAP3630+: SmartReflex 1p5: remove voltage clamp down fb5a6e5 OMAP4460: OPP: SR1.5: update margin to spec rev 0.4 e667785 OMAP3630+: SmartReflex 1.5: use margins per volt_data af5e395 OMAP2+: PM: Voltage: allow software margin per OPP Change-Id: I65ba29cb884e30fe44b04987a10810ec44248804 Conflicts: kernel --- kernel | Bin 4096928 -> 4098636 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 8eccab2..9f2cdd4 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 8c58faa5e634ed54e565ae6150168a43cbcffa00 Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Tue, 24 Apr 2012 13:58:25 -0700 Subject: tuna: Power HAL: Add VSYNC power hint Change-Id: I3a0c72e843c4d9c7a9129a35ed8bbee59acb5599 Signed-off-by: Todd Poynor --- power/power_tuna.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/power/power_tuna.c b/power/power_tuna.c index eb38410..bff028d 100644 --- a/power/power_tuna.c +++ b/power/power_tuna.c @@ -34,6 +34,10 @@ static int sPowerStatefd; static const char *pwr_states[] = { "mem", "on" }; +#define BOOST_PATH "/sys/devices/system/cpu/cpufreq/interactive/boost" +static int boost_fd = -1; +static int boost_warned; + static void sysfs_write(char *path, char *s) { char buf[80]; @@ -103,6 +107,37 @@ static void tuna_power_set_interactive(struct power_module *module, int on) } } +static void tuna_power_hint(struct power_module *module, power_hint_t hint, + void *data) +{ + char buf[80]; + int len; + + switch (hint) { + case POWER_HINT_VSYNC: + if (boost_fd < 0) + boost_fd = open(BOOST_PATH, O_WRONLY); + + if (boost_fd < 0) { + if (!boost_warned) { + strerror_r(errno, buf, sizeof(buf)); + ALOGE("Error opening %s: %s\n", BOOST_PATH, buf); + boost_warned = 1; + } + break; + } + + len = write(boost_fd, (int) data ? "1" : "0", 1); + if (len < 0) { + strerror_r(errno, buf, sizeof(buf)); + ALOGE("Error writing to %s: %s\n", BOOST_PATH, buf); + } + break; + + default: + break; + } +} static struct hw_module_methods_t power_module_methods = { .open = NULL, @@ -121,4 +156,5 @@ struct power_module HAL_MODULE_INFO_SYM = { .init = tuna_power_init, .setInteractive = tuna_power_set_interactive, + .powerHint = tuna_power_hint, }; -- cgit v1.1 From 3b603e2486ed2bb9698f264377da06db6fd8e83f Mon Sep 17 00:00:00 2001 From: Ken Sumrall Date: Thu, 1 Mar 2012 18:07:35 -0800 Subject: Use the filesystem mounter to mount and check filesystems fs_mgr reads /fstab. to determine what to mount and what to check, and removes the details from the init..rc file. Change-Id: Idf9f9ba737a4850dc15a926a74e74b9d7023693f --- device.mk | 2 ++ fstab.tuna | 11 +++++++++++ init.tuna.rc | 7 +------ 3 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 fstab.tuna diff --git a/device.mk b/device.mk index 6b89b58..3ecc226 100644 --- a/device.mk +++ b/device.mk @@ -69,6 +69,7 @@ PRODUCT_COPY_FILES += \ $(LOCAL_KERNEL):kernel \ device/samsung/tuna/init.tuna.rc:root/init.tuna.rc \ device/samsung/tuna/init.tuna.usb.rc:root/init.tuna.usb.rc \ + device/samsung/tuna/fstab.tuna:root/fstab.tuna \ device/samsung/tuna/ueventd.tuna.rc:root/ueventd.tuna.rc \ device/samsung/tuna/media_profiles.xml:system/etc/media_profiles.xml \ device/samsung/tuna/media_codecs.xml:system/etc/media_codecs.xml \ @@ -192,6 +193,7 @@ PRODUCT_PACKAGES += \ # Filesystem management tools PRODUCT_PACKAGES += \ make_ext4fs \ + e2fsck \ setup_fs # for bugmailer diff --git a/fstab.tuna b/fstab.tuna new file mode 100644 index 0000000..d9b7503 --- /dev/null +++ b/fstab.tuna @@ -0,0 +1,11 @@ +# Android fstab file. +# +# The filesystem that contains the filesystem checker binary (typically /system) cannot +# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK + + +/dev/block/platform/omap/omap_hsmmc.0/by-name/system /system ext4 ro wait +/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 + diff --git a/init.tuna.rc b/init.tuna.rc index 36d6bb9..1e0a87f 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -41,7 +41,6 @@ on post-fs-data on boot mount debugfs /sys/kernel/debug /sys/kernel/debug chmod 0666 /dev/pvrsrvkm - setprop ro.crypto.keyfile.userdata /dev/block/platform/omap/omap_hsmmc.0/by-name/metadata # autosuspend root hubs immediatly after attached devices write /sys/bus/usb/devices/usb1/power/autosuspend_delay_ms 0 @@ -49,11 +48,7 @@ on boot on fs mkdir /factory 0775 radio radio - mount ext4 /dev/block/platform/omap/omap_hsmmc.0/by-name/system /system wait ro - setprop ro.crypto.tmpfs_options size=128m,mode=0771,uid=1000,gid=1000 - mount ext4 /dev/block/platform/omap/omap_hsmmc.0/by-name/userdata /data wait noatime nosuid nodev nomblk_io_submit,errors=panic - mount ext4 /dev/block/platform/omap/omap_hsmmc.0/by-name/cache /cache wait noatime nosuid nodev nomblk_io_submit,errors=panic - mount ext4 /dev/block/platform/omap/omap_hsmmc.0/by-name/efs /factory wait ro + mount_all /fstab.tuna setprop ro.crypto.fuse_sdcard true # change permissions for mtd device -- cgit v1.1 From be069e6d933a9f8d8db191f4f4d94a48c6ade010 Mon Sep 17 00:00:00 2001 From: Dan Murphy Date: Mon, 16 Jan 2012 09:44:03 -0600 Subject: [Tuna] Add product specific definition to HDCP symlink Add product specific definition to the HDCP symlink creation. Without this protection performing a make after lunch for other products will force the inheritance of this symlink into the build. When creating the ota and update packages for other targets these symlinks are not created. This will cause other products to fail HDCP symlink association since the symlink was not created for the target product. Change-Id: Id2125840269d70de250231c56eabe4a3f3a97886 Signed-off-by: Dan Murphy --- Android.mk | 3 +++ BoardConfig.mk | 1 + 2 files changed, 4 insertions(+) diff --git a/Android.mk b/Android.mk index 035d08a..0e3f37d 100644 --- a/Android.mk +++ b/Android.mk @@ -22,6 +22,7 @@ LOCAL_PATH := $(call my-dir) +ifeq ($(BOARD_CREATE_TUNA_HDCP_KEYS_SYMLINK), true) include $(CLEAR_VARS) LOCAL_MODULE := tuna_hdcp_keys @@ -44,3 +45,5 @@ $(LOCAL_BUILT_MODULE): $(hide) touch $@ include $(call all-makefiles-under,$(LOCAL_PATH)) + +endif diff --git a/BoardConfig.mk b/BoardConfig.mk index b1a43ac..3ac5886 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -38,6 +38,7 @@ TARGET_BOOTLOADER_BOARD_NAME := tuna TARGET_BOARD_INFO_FILE := device/samsung/tuna/board-info.txt BOARD_EGL_CFG := device/samsung/tuna/egl.cfg +BOARD_CREATE_TUNA_HDCP_KEYS_SYMLINK := true #BOARD_USES_HGL := true #BOARD_USES_OVERLAY := true -- cgit v1.1 From 97f3dccd3db46304a7d752e8faa22af6f41e6d1e Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Wed, 2 May 2012 11:03:12 -0700 Subject: tuna: kernel prebuilt d2cb75c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 072c198 Merge branch 'android-3.0' into android-omap-3.0 d60ec08 net: wireless: bcmdhd: Update to Version 5.90.195.61 216527e net: wireless: bcmdhd: Turn OFF wlan power if interface UP fails BUG: b/6388856, b/6005966 Change-Id: Ie8eab8791d927c54a6ca9c788977d06d011bae9a Signed-off-by: Dmitry Shmidt --- kernel | Bin 4107940 -> 4108504 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 25e0d30..e2e2e49 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 219848f6ce1e8c2df8c02db4fd0b92eff996605a Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Wed, 16 May 2012 18:25:08 -0700 Subject: tuna: kernel prebuilt 1244eba1 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 c14a1079 Merge branch 'android-3.0' into android-omap-3.0 605a4932 net: wireless: bcmdhd: Ignore signal_pending() while waiting in IOCTL f242b6d8 net: wireless: bcmdhd: Check return value from dhd_dev_init_ioctl() b9fd9e23 net: wireless: bcmdhd: Fix WARN_ON(!res->pub.channel) 08cad5bc net: wireless: bcmdhd: Change singal pending return value from -110 to -4 8dd07181 Revert "HACK: input: mms_ts: Log a touch event after driver enable." 1f0627de USB: gadget: f_audio_source: New gadget driver for audio output 71c42632 USB: gadget: f_accessory: Add support for HID input devices 319e8228 Add ACCESSORY_SET_AUDIO_MODE control request and ioctl BUG: b/6005966, b/6493671, b/6335854, b/6457409 Change-Id: I0a5ed09e46ae2d38f6218dcdc8564064d5ae46b5 Signed-off-by: Dmitry Shmidt --- kernel | Bin 4140064 -> 4142492 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index c329cd9..320c9bc 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 1eb976734f8404bc5da40b4f6ec7769160a91e72 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Fri, 25 May 2012 14:40:43 -0700 Subject: Import translations. DO NOT MERGE Change-Id: I5fc26962b300a9aa2a83ef5c492bb477b3ec57e2 --- overlay/packages/apps/Settings/res/values-cs/arrays.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/overlay/packages/apps/Settings/res/values-cs/arrays.xml b/overlay/packages/apps/Settings/res/values-cs/arrays.xml index 266d10e..265da14 100644 --- a/overlay/packages/apps/Settings/res/values-cs/arrays.xml +++ b/overlay/packages/apps/Settings/res/values-cs/arrays.xml @@ -21,11 +21,11 @@ - "15 s." - "30 s." - "1 min." - "2 min." - "5 min." - "10 min." + "15 sekund" + "30 sekund" + "1 minuta" + "2 minuty" + "5 minut" + "10 minut" -- cgit v1.1 From 67fde1a34b4bc3d6741ee71ba083ee1c4e56033d Mon Sep 17 00:00:00 2001 From: Benoit Goby Date: Thu, 14 Jun 2012 12:08:22 -0700 Subject: tuna: prebuilt kernel a95919f misc: modem_if: link_mipi: use tx length for return before calling work queue Bug: 6281406 Change-Id: I54ef96e440c5c2df4bc7313f20c9dd93c830c05c --- kernel | Bin 4141640 -> 4141680 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 94a24ff..a6b187f 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 76c7a5bf734dd63a1bd7e9a856242040423d5438 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 18 Jun 2012 14:34:57 -0700 Subject: Import translations. DO NOT MERGE Change-Id: I36532a2b851b39fa1eeed891df9e2198657d2e8f --- overlay/packages/apps/Settings/res/values-nb/arrays.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/overlay/packages/apps/Settings/res/values-nb/arrays.xml b/overlay/packages/apps/Settings/res/values-nb/arrays.xml index c5db781..a365905 100644 --- a/overlay/packages/apps/Settings/res/values-nb/arrays.xml +++ b/overlay/packages/apps/Settings/res/values-nb/arrays.xml @@ -23,9 +23,9 @@ "15 sekunder" "30 sekunder" - "Ett minutt" - "To minutter" - "Fem minutter" - "Ti minutter" + "1 minutt" + "2 minutter" + "5 minutter" + "10 minutter" -- cgit v1.1 From 996da01c08a2d168f13d63032de91f9ac21e4cd0 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 15 Jun 2012 14:49:21 -0700 Subject: audio: acquire lock in adev_set_voice_volume() Acquire the audio device mutex before calling into ril library in adev_set_voice_volume() to avoid concurrency with other calls to ril from select_mode() or set_incall_device(). Bug 6626532. Change-Id: I2347477b39ce46137a654047266b70dd691c021c --- audio/audio_hw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 74f2383..d377f2b 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -1142,7 +1142,7 @@ static void select_mode(struct tuna_audio_device *adev) adev->devices &= ~AUDIO_DEVICE_OUT_SPEAKER; select_output_device(adev); start_call(adev); - adev_set_voice_volume(&adev->hw_device, adev->voice_volume); + ril_set_call_volume(&adev->ril, SOUND_TYPE_VOICE, adev->voice_volume); adev->in_call = 1; } } else { @@ -3408,11 +3408,13 @@ static int adev_set_voice_volume(struct audio_hw_device *dev, float volume) { struct tuna_audio_device *adev = (struct tuna_audio_device *)dev; + pthread_mutex_lock(&adev->lock); adev->voice_volume = volume; if (adev->mode == AUDIO_MODE_IN_CALL) ril_set_call_volume(&adev->ril, SOUND_TYPE_VOICE, volume); + pthread_mutex_unlock(&adev->lock); return 0; } -- cgit v1.1 From 8eb734e945dd3b55d9fabacfebc02fd25989fa9a Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Wed, 14 Mar 2012 12:50:51 -0700 Subject: Use audio_channel_mask_t consistently Change-Id: I90a50b58dd23fe522724df53f08b4f9687150da6 --- audio/audio_hw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/audio_hw.c b/audio/audio_hw.c index d377f2b..8ae519c 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -1681,7 +1681,7 @@ static size_t out_get_buffer_size_hdmi(const struct audio_stream *stream) return HDMI_MULTI_PERIOD_SIZE * audio_stream_frame_size((struct audio_stream *)stream); } -static uint32_t out_get_channels(const struct audio_stream *stream) +static audio_channel_mask_t out_get_channels(const struct audio_stream *stream) { struct tuna_stream_out *out = (struct tuna_stream_out *)stream; @@ -2240,7 +2240,7 @@ static size_t in_get_buffer_size(const struct audio_stream *stream) popcount(in->main_channels)); } -static uint32_t in_get_channels(const struct audio_stream *stream) +static audio_channel_mask_t in_get_channels(const struct audio_stream *stream) { struct tuna_stream_in *in = (struct tuna_stream_in *)stream; -- cgit v1.1 From b48bb6dd51fe4adfe1ad72cf5f69ee7c5feee07d Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 13 Jul 2012 13:01:48 -0700 Subject: Import translations. DO NOT MERGE Change-Id: I5c5fe495ec486d1de6e7e1e483ce64bf81458d28 Auto-generated-cl: translation import --- overlay/packages/apps/Settings/res/values-fa/arrays.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/overlay/packages/apps/Settings/res/values-fa/arrays.xml b/overlay/packages/apps/Settings/res/values-fa/arrays.xml index bf95ca8..71915a9 100644 --- a/overlay/packages/apps/Settings/res/values-fa/arrays.xml +++ b/overlay/packages/apps/Settings/res/values-fa/arrays.xml @@ -21,11 +21,11 @@ - "15 ثانیه" - "30 ثانیه" - "1 دقیقه" - "2 دقیقه" - "5 دقیقه" - "10 دقیقه" + "۱۵ ثانیه" + "۳۰ ثانیه" + "۱ دقیقه" + "۲ دقیقه" + "۵ دقیقه" + "۱۰ دقیقه" -- cgit v1.1 From b5f88903c387b208629bcc04aad2c92f242e4144 Mon Sep 17 00:00:00 2001 From: Matthew Xie Date: Mon, 26 Mar 2012 12:07:14 -0700 Subject: Add bthid device driver ko file. Init it as device driver node. Author: Priti Aghera Change-Id: Iae05cfeca4a02755594c1276135b5aa737c90004 --- bthid.ko | Bin 0 -> 91186 bytes device.mk | 3 +++ init.tuna.rc | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 bthid.ko diff --git a/bthid.ko b/bthid.ko new file mode 100644 index 0000000..a2d82a1 Binary files /dev/null and b/bthid.ko differ diff --git a/device.mk b/device.mk index 1e3c028..3c343a4 100644 --- a/device.mk +++ b/device.mk @@ -79,6 +79,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf +PRODUCT_COPY_FILES += \ + device/samsung/tuna/bthid.ko:system/lib/modules/bthid.ko + # Wifi ifneq ($(TARGET_PREBUILT_WIFI_MODULE),) PRODUCT_COPY_FILES += \ diff --git a/init.tuna.rc b/init.tuna.rc index 070ab1d..86dec0c 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -46,6 +46,11 @@ on boot write /sys/bus/usb/devices/usb1/power/autosuspend_delay_ms 0 write /sys/bus/usb/devices/usb2/power/autosuspend_delay_ms 0 +# Start kernel driver (for BTHID) + insmod /system/lib/modules/bthid.ko + chmod 0660 /dev/bthid + chown bluetooth bluetooth /dev/bthid + on fs mkdir /factory 0775 radio radio mount_all /fstab.tuna -- cgit v1.1 From 1681a277aeaa794a35eff17e3ef648eadcdc4b11 Mon Sep 17 00:00:00 2001 From: zzy Date: Sat, 14 Apr 2012 19:09:37 -0700 Subject: added bt-pan network interface for tethering --- overlay/frameworks/base/core/res/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index f85627b..a8e196a 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -213,7 +213,7 @@ bluetooth interfaces. If the device doesn't want to support tethering over bluetooth this should be empty. --> - "bnep\\d" + "bt-pan" -- cgit v1.1 From 32c13ca6d861b55c78e92329ba9ae6f5363fd1bd Mon Sep 17 00:00:00 2001 From: Benoit Goby Date: Mon, 16 Jul 2012 18:10:34 -0700 Subject: tuna: kernel prebuilt 396c4df Toro: Update USB gadget for DM feature Bug: 6829107 Change-Id: I8a33a3fae8bf7eb4e6c19f327f0f9b70ed056fa0 --- kernel | Bin 4141660 -> 4141868 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 6b2ae13..2361fdc 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 7e0eda708b1b89d74c25244ea8a0f1c6623d7362 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Tue, 17 Jul 2012 12:39:13 -0700 Subject: tuna: dumpstate: Add wlan info dump Change-Id: Id1ddc016164e8b0617b70a27175bc77f13970f9c Signed-off-by: Dmitry Shmidt --- dumpstate/dumpstate.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dumpstate/dumpstate.c b/dumpstate/dumpstate.c index 2858b2c..61602e4 100644 --- a/dumpstate/dumpstate.c +++ b/dumpstate/dumpstate.c @@ -38,4 +38,5 @@ void dumpstate_board() dump_file("fsa9480 device_type", "/sys/bus/i2c/drivers/fsa9480/4-0025/device_type"); dump_file("fsa9480 control", "/sys/bus/i2c/drivers/fsa9480/4-0025/control"); dump_file("tiler 2x1 map", "/d/tiler/map/2x1"); + dump_file("wlan", "/sys/module/bcmdhd/parameters/info_string"); }; -- cgit v1.1 From a497c2dd79ee6d895a9f335822894e165fd10309 Mon Sep 17 00:00:00 2001 From: Benoit Goby Date: Mon, 16 Jul 2012 18:10:34 -0700 Subject: tuna: kernel prebuilt 396c4df Toro: Update USB gadget for DM feature Bug: 6829107 Change-Id: I8a33a3fae8bf7eb4e6c19f327f0f9b70ed056fa0 --- kernel | Bin 4141660 -> 4141868 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 6b2ae13..2361fdc 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From d42b535c767000633a94b62f7dfa4f1f4b9f65eb Mon Sep 17 00:00:00 2001 From: Benoit Goby Date: Mon, 16 Jul 2012 18:10:34 -0700 Subject: tuna: kernel prebuilt 396c4df Toro: Update USB gadget for DM feature Bug: 6829107 Change-Id: I8a33a3fae8bf7eb4e6c19f327f0f9b70ed056fa0 --- kernel | Bin 4141660 -> 4141868 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 6b2ae13..2361fdc 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 58a4a7345c5a9131301d6fd599ae0686513ad2c1 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Fri, 27 Jul 2012 11:03:58 -0700 Subject: tuna: kernel prebuilt e6a34c5 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 5696a46 Merge branch 'android-3.0' into android-omap-3.0 e463932 net: wireless: bcmdhd: Fill station_info packet fields 62618c1 net: wireless: bcmdhd: Prevent HT Avail request failure to flood the log 3421d0b net: wireless: bcmdhd: Use proper jiffie-related functions c491722 net: wireless: bcmdhd: Adjust driver/fw/chip info format b595a66 x86: Call idle notifiers 66943ea net: wireless: bcmdhd: Add info_string param with driver/fw/chip info f4702ad net: wireless: bcmdhd: Remove country update from wl_update_wiphybands a5c77fe net: wireless: bcmdhd: Fix P2P GO hang issue df06df7 net: wireless: bcmdhd: Update wiphy bands on band change 230efa6 net: wireless: bcmdhd: Init locks in dhd_attach() at the beginning f70624b net: wireless: bcm4329: Init locks in dhd_attach() at the beginning fa98f04 net: wireless: bcmdhd: Add mutex to wl_update_wiphybands() 22baf5d net: wireless: bcmdhd: Skip country setting if unnecessary 6898353 net: wireless: bcmdhd: Return wl_construct_reginfo() call d7ade6c net: wireless: bcmdhd: Add wiphyband update for country change 38fac5b net: wireless: bcmdhd: Skip inaccurate wl_construct_reginfo() call 562490d net: wireless: bcmdhd: Ignore error if "chanspecs" command is not supported 1ed2a48 net: wireless: bcmdhd: Reduce priority for dhd_dpc and watchdog 2749b2e net: wireless: bcmdhd: Reload FW in case of constant scan failure BUG: b/6874044, b/6404900, b/6815371 Change-Id: Ic6c58b96c2c3b131612a6784433347d4b9a8cdee Signed-off-by: Dmitry Shmidt --- kernel | Bin 4141868 -> 4143188 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 2361fdc..3b0feb1 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 236a547caaf8a15ead65c2adff3de2c3a224d0cc Mon Sep 17 00:00:00 2001 From: Madan Ankapura Date: Thu, 2 Aug 2012 15:52:47 -0700 Subject: add toroplus to the recovery target Change-Id: I4405e50d6ac87c4f52e8ca14de125087854be082 Signed-off-by: Madan Ankapura --- recovery/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recovery/Android.mk b/recovery/Android.mk index 770feee..72cd80e 100644 --- a/recovery/Android.mk +++ b/recovery/Android.mk @@ -1,4 +1,4 @@ -ifneq (,$(findstring $(TARGET_DEVICE),tuna toro torospr maguro)) +ifneq (,$(findstring $(TARGET_DEVICE),tuna toro toroplus maguro)) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -- cgit v1.1 From ce1fab3ab50b39cec1220d65169bffed5f6494cd Mon Sep 17 00:00:00 2001 From: "dw0918.jeon" Date: Wed, 15 Feb 2012 13:15:28 +0900 Subject: add permissions to dev/cdam_cplog needed to collect the modem logs Change-Id: Ic5e0e8c508c04988dd9ac9ddb33a04978c86c4bc Signed-off-by: Madan Ankapura --- ueventd.tuna.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ueventd.tuna.rc b/ueventd.tuna.rc index 23cd5ab..00a8e37 100644 --- a/ueventd.tuna.rc +++ b/ueventd.tuna.rc @@ -44,3 +44,6 @@ /dev/modem_br 0660 radio radio /dev/cdma_ramdump0 0660 radio radio /dev/lte_ramdump0 0660 radio radio + +#for cp log +/dev/cdma_cplog 0660 radio radio -- cgit v1.1 From a5537876b46a31a40ae5218d1dd5b84bef3c5c27 Mon Sep 17 00:00:00 2001 From: Benoit Goby Date: Mon, 16 Jul 2012 18:10:34 -0700 Subject: tuna: kernel prebuilt 396c4df Toro: Update USB gadget for DM feature Bug: 6829107 Change-Id: I8a33a3fae8bf7eb4e6c19f327f0f9b70ed056fa0 --- kernel | Bin 4141660 -> 4141868 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 6b2ae13..2361fdc 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From b69d5d1b10665e094af53ffddc738cba2be17ff4 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Sat, 4 Aug 2012 13:28:58 -0700 Subject: tuna: kernel prebuilt DO NOT MERGE d904c9f Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 b7fa52e Merge branch 'linux-omap-3.0' into android-omap-3.0 647167a Merge branch 'android-3.0' into android-omap-3.0 2fa1f1c USB: gadget: f_audio_source: Fix error handling and increase packet size e6a34c5 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 5696a46 Merge branch 'android-3.0' into android-omap-3.0 e463932 net: wireless: bcmdhd: Fill station_info packet fields 62618c1 net: wireless: bcmdhd: Prevent HT Avail request failure to flood the log 3421d0b net: wireless: bcmdhd: Use proper jiffie-related functions c491722 net: wireless: bcmdhd: Adjust driver/fw/chip info format Change-Id: Ie4cefaae0936d78a8b27e2eea8dd960833da1f67 Signed-off-by: Mike Lockwood --- kernel | Bin 4141868 -> 4143008 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 2361fdc..42a2995 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From a424e789f4790778bdd962bd2a032f64050eba89 Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Tue, 7 Aug 2012 22:55:51 -0700 Subject: prebuilt kernel (DDK 1.9RC1, usb gadget,...) 19aecca gpu: pvr: Update to DDK 1.9.RC1.JB@2113614 d904c9f Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 b7fa52e Merge branch 'linux-omap-3.0' into android-omap-3.0 647167a Merge branch 'android-3.0' into android-omap-3.0 2fa1f1c USB: gadget: f_audio_source: Fix error handling and increase packet size 1eee0cb OMAP: mcspi: Perform NULL pointer check before accessing cd->swap_datalines 1b8153c OMAP4: hsmmc: fix race conditions in suspend/resume path Change-Id: I42406dded6ffe73285fbc85cf8a23f05f030327e --- kernel | Bin 4143188 -> 4145940 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 3b0feb1..a9e0552 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 81b654661b8ecc819847ad1ede8e3a5ff19f5041 Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Wed, 8 Aug 2012 11:34:53 -0700 Subject: Revert "prebuilt kernel (DDK 1.9RC1, usb gadget,...)" This reverts commit a424e789f4790778bdd962bd2a032f64050eba89. Bug: 6951799 --- kernel | Bin 4145940 -> 4143188 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index a9e0552..3b0feb1 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From f720fd0f4f5766dd1d401b544113806d493da5bb Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Wed, 8 Aug 2012 11:34:53 -0700 Subject: Revert "prebuilt kernel (DDK 1.9RC1, usb gadget,...)" This reverts commit a424e789f4790778bdd962bd2a032f64050eba89. Bug: 6951799 --- kernel | Bin 4145940 -> 4143188 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index a9e0552..3b0feb1 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 60468b085c78e4902709231d89f1d958bcb59e87 Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Wed, 1 Aug 2012 15:59:09 -0700 Subject: Update config.xml overlay for new key config_overlay_locationProviderPackageNames Change-Id: Iee90badf46f797a2fdf76e8fbfef61b8edc0c340 --- overlay/frameworks/base/core/res/res/values/config.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index a8e196a..2a08cac 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -234,11 +234,9 @@ false - - com.google.android.location - - - com.google.android.location + + com.google.android.location + true -- cgit v1.1 From 20cb7d0396aaf69a9abf10d1a5913db36b66a65d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Fri, 10 Aug 2012 09:48:38 -0700 Subject: Fix build - Add TARGET_ARCH := arm Change-Id: I6e4b534b18be8fea3b7fff1bcdc7931399456db4 --- BoardConfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/BoardConfig.mk b/BoardConfig.mk index 7fa3d44..6df76b3 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -24,6 +24,7 @@ USE_CAMERA_STUB := true TARGET_CPU_ABI := armeabi-v7a TARGET_CPU_ABI2 := armeabi TARGET_CPU_SMP := true +TARGET_ARCH := arm TARGET_ARCH_VARIANT := armv7-a-neon ARCH_ARM_HAVE_TLS_REGISTER := true -- cgit v1.1 From ea3c6b20bbde07a4d77f41ea0a02f29f8bdc441b Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Mon, 13 Aug 2012 15:46:33 -0700 Subject: tuna: prebuilt kernel (BT power, DDK revert, gadget fix) 6487a87 Revert "gpu: pvr: Update to DDK 1.9.RC1.JB@2113614" 9c15339 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 7073962 Merge branch 'android-3.0' into android-omap-3.0 9a6bc34 netfilter: xt_IDLETIMER: Rename INTERFACE to LABEL in netlink notification. e15cb99 net: wireless: bcmdhd: Use correct time from boot for TSF 6d33163 Tuna bluetooth: set rfkill state before register it a1bc297 scripts/Kbuild.include: Fix portability problem of "echo -e" 19aecca gpu: pvr: Update to DDK 1.9.RC1.JB@2113614 d904c9f Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 b7fa52e Merge branch 'linux-omap-3.0' into android-omap-3.0 647167a Merge branch 'android-3.0' into android-omap-3.0 2fa1f1c USB: gadget: f_audio_source: Fix error handling and increase packet size 1eee0cb OMAP: mcspi: Perform NULL pointer check before accessing cd->swap_datalines 1b8153c OMAP4: hsmmc: fix race conditions in suspend/resume path Change-Id: I0faa1be16859270f88a0a0b03dfdc1c1e930073b --- kernel | Bin 4143188 -> 4143052 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 3b0feb1..a95b59e 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 5b7ab84f98b99d6a114db16901392944457da4b7 Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Mon, 13 Aug 2012 15:46:33 -0700 Subject: tuna: prebuilt kernel (BT power, DDK revert, gadget fix) 6487a87 Revert "gpu: pvr: Update to DDK 1.9.RC1.JB@2113614" 9c15339 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 7073962 Merge branch 'android-3.0' into android-omap-3.0 9a6bc34 netfilter: xt_IDLETIMER: Rename INTERFACE to LABEL in netlink notification. e15cb99 net: wireless: bcmdhd: Use correct time from boot for TSF 6d33163 Tuna bluetooth: set rfkill state before register it a1bc297 scripts/Kbuild.include: Fix portability problem of "echo -e" 19aecca gpu: pvr: Update to DDK 1.9.RC1.JB@2113614 d904c9f Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 b7fa52e Merge branch 'linux-omap-3.0' into android-omap-3.0 647167a Merge branch 'android-3.0' into android-omap-3.0 2fa1f1c USB: gadget: f_audio_source: Fix error handling and increase packet size 1eee0cb OMAP: mcspi: Perform NULL pointer check before accessing cd->swap_datalines 1b8153c OMAP4: hsmmc: fix race conditions in suspend/resume path Change-Id: I0faa1be16859270f88a0a0b03dfdc1c1e930073b --- kernel | Bin 4143188 -> 4143052 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 3b0feb1..a95b59e 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From b87103903a3dbe7eedc4009f6f3076b927ae75af Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 13 Aug 2012 16:47:58 -0700 Subject: Specify destination sdcard mount point. Bug: 6925012 Change-Id: Ib9d5ce0dfba3669e75a9c57af9f7ae3872bb6235 --- init.tuna.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.tuna.rc b/init.tuna.rc index 86dec0c..41d35e4 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -165,7 +165,7 @@ service smc_pa_wvdrm /system/bin/smc_pa_ctrl \ # create virtual SD card at /storage/sdcard0, based on the /data/media directory # daemon will drop to user/group system/media_rw after initializing # underlying files in /data/media will be created with user and group media_rw (1023) -service sdcard /system/bin/sdcard /data/media 1023 1023 +service sdcard /system/bin/sdcard /data/media /storage/sdcard0 1023 1023 class late_start service p2p_supplicant /system/bin/wpa_supplicant \ -- cgit v1.1 From 4761c267845ffa6e431e0252a537e5f0d5e9a4f1 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Tue, 14 Aug 2012 16:31:51 -0700 Subject: use bsdiff not imgdiff to compute radio diffs Change-Id: Ib4f81eaf0e5229ea2a1c8662479780fafead7231 --- releasetools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releasetools.py b/releasetools.py index 056c7dc..b9dabdb 100644 --- a/releasetools.py +++ b/releasetools.py @@ -102,7 +102,7 @@ def WriteRadio(info, target_radio_img, source_radio_img=None): if tf.sha1 == sf.sha1: print "radio image unchanged; skipping" else: - diff = common.Difference(tf, sf) + diff = common.Difference(tf, sf, diff_program="bsdiff") common.ComputeDifferences([diff]) _, _, d = diff.GetPatch() if d is None or len(d) > tf.size * common.OPTIONS.patch_threshold: -- cgit v1.1 From d7f5ab6282faabb4b918fde55f85ab87667ba876 Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Tue, 14 Aug 2012 18:32:18 -0700 Subject: tuna: prebuilt kernel (HSMMC1 suspend fix) 4d8fd18 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 27ca401 Merge branch 'linux-omap-3.0' into android-omap-3.0 88e85fa Merge branch 'android-3.0' into android-omap-3.0 a15bf22 Revert "OMAP4: hsmmc: fix race conditions in suspend/resume path" 11c327f net: wireless: bcm4329: Remove obsolete files Change-Id: I310b1c46e096d643314d289aaef6c6a5aa08ebea --- kernel | Bin 4143052 -> 4143148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index a95b59e..64858a2 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 6b6fdeb47f67b5931ae5b369bc9b62e82bd12b8c Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Tue, 14 Aug 2012 18:37:26 -0700 Subject: tuna: prebuilt kernel (HSMMC1 suspend fix) ed3fbf9 Revert "OMAP4: hsmmc: fix race conditions in suspend/resume path" Change-Id: I8c169fe4a92d3952fb83e2b99c374b626f9242d2 --- kernel | Bin 4143008 -> 4143144 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 42a2995..a84e8a9 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From ac9512ea585ec54034829f53cda23c3b6c2d06c0 Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Tue, 14 Aug 2012 18:32:18 -0700 Subject: tuna: prebuilt kernel (HSMMC1 suspend fix) 4d8fd18 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 27ca401 Merge branch 'linux-omap-3.0' into android-omap-3.0 88e85fa Merge branch 'android-3.0' into android-omap-3.0 a15bf22 Revert "OMAP4: hsmmc: fix race conditions in suspend/resume path" 11c327f net: wireless: bcm4329: Remove obsolete files Change-Id: I310b1c46e096d643314d289aaef6c6a5aa08ebea --- kernel | Bin 4143052 -> 4143148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index a95b59e..64858a2 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From a3471cd8e45f43704c882ddff985df7818971e3a Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 16 Aug 2012 13:44:37 -0700 Subject: Multi-user external storage support. Move FUSE daemon to secure mount point, and relax /storage access now that sdcard_r is enforced using private bind mounts in zygote. Bug: 6925012 Change-Id: I6c3b54e07a176408053749de6966b26c9f58bb5f --- init.tuna.rc | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/init.tuna.rc b/init.tuna.rc index 41d35e4..bf91ed4 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -1,17 +1,21 @@ import init.tuna.usb.rc -on early-init - export EXTERNAL_STORAGE /storage/sdcard0 - mkdir /storage 0050 system sdcard_r - mkdir /storage/sdcard0 0000 system system - # for backwards compatibility - symlink /storage/sdcard0 /sdcard - symlink /storage/sdcard0 /mnt/sdcard +on init + mkdir /mnt/secure/sdcard0 0700 root root + + export EXTERNAL_STORAGE /storage/sdcard0 + mkdir /storage 0711 root root + mkdir /storage/sdcard0 0000 root root + symlink /storage/sdcard0 /sdcard + symlink /storage/sdcard0 /mnt/sdcard + + # Save bugreports as owner + export BUGREPORT_WRITE_PATH /mnt/secure/sdcard0/0 + export BUGREPORT_READ_PATH /storage/sdcard0 on post-fs-data - # we will remap this as /storage/sdcard0 with the sdcard fuse tool - mkdir /data/media 0770 media_rw media_rw - chown media_rw media_rw /data/media + mkdir /data/media 0770 media_rw media_rw + mkdir /data/misc/wifi 0770 wifi wifi mkdir /data/misc/wifi/sockets 0770 wifi wifi mkdir /data/misc/dhcp 0770 dhcp dhcp @@ -162,11 +166,9 @@ service smc_pa_wvdrm /system/bin/smc_pa_ctrl \ group drmrpc oneshot -# create virtual SD card at /storage/sdcard0, based on the /data/media directory -# daemon will drop to user/group system/media_rw after initializing -# underlying files in /data/media will be created with user and group media_rw (1023) -service sdcard /system/bin/sdcard /data/media /storage/sdcard0 1023 1023 - class late_start +# virtual sdcard daemon running as media_rw (1023) +service sdcard /system/bin/sdcard /data/media /mnt/secure/sdcard0 1023 1023 + class late_start service p2p_supplicant /system/bin/wpa_supplicant \ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -N \ -- cgit v1.1 From 3d5466143d183175d66c8f4d7f532595d5765a88 Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Thu, 16 Aug 2012 14:54:50 -0700 Subject: tuna: prebuilt kernel (USB HID, USB audio fix, MMC suspend fixes) 8fae35c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 2dfc945 Merge branch 'linux-omap-3.0' into android-omap-3.0 1062dd1 Merge branch 'android-3.0' into android-omap-3.0 16f1d42 USB: gadget: f_audio_source: Fix compilation error 54c7c33 USB: gadget: f_audio_source: Fix use after free in audio_unbind d4bad8b HID: uhid: Fix sending events with invalid data db58898 HID: uhid: silence gcc warning d33f92d MAINTAINERS: add UHID entry 9634f81 HID: uhid: add example program bd76675 HID: uhid: add documentation c12e46f HID: uhid: implement feature requests 715ee7c HID: uhid: forward raw output reports to user-space bd46634 HID: uhid: forward output request to user-space e458139 HID: uhid: forward open/close events to user-space 245fd8c HID: uhid: add UHID_START and UHID_STOP events 6645460 HID: uhid: forward hid report-descriptor to hid core e0ad830 HID: uhid: allow feeding input data into uhid devices 6b1a4c7 HID: uhid: add UHID_CREATE and UHID_DESTROY events d3444a8 HID: uhid: implement write() on uhid devices b8dd3d9 HID: uhid: implement read() on uhid devices 191b032 HID: uhid: allow poll()'ing on uhid devices ef5006b HID: uhid: add internal message buffer 4409981 HID: uhid: introduce user-space I/O driver support for HID 392f3a3 OMAP4: hsmmc: fix race conditions in suspend/resume path efadaa2 mmc: Make sure host is disabled on suspend Change-Id: I55ec9aad5a629335bf9506538557f87ca4742d10 --- kernel | Bin 4143148 -> 4143232 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 64858a2..94d37f0 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 5fa370b1f3774ae3d38a98fffa23528cc4ac4068 Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Thu, 16 Aug 2012 13:43:52 -0700 Subject: tuna: prebuilt kernel (USB audio use after free) -- DO NOT MERGE d17245c USB: gadget: f_audio_source: Fix compilation error 7f30487 USB: gadget: f_audio_source: Fix use after free in audio_unbind Change-Id: I86f390b66a49cf53a484247ba9b61ef2ab9e2c0f --- kernel | Bin 4143144 -> 4143196 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index a84e8a9..a08cf49 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From fc875d3e5965f583fc3b9f70d317188e8276ce3e Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Tue, 14 Aug 2012 18:37:26 -0700 Subject: tuna: prebuilt kernel (HSMMC1 suspend fix) ed3fbf9 Revert "OMAP4: hsmmc: fix race conditions in suspend/resume path" Change-Id: I8c169fe4a92d3952fb83e2b99c374b626f9242d2 Conflicts: kernel --- kernel | Bin 4141868 -> 4143144 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 2361fdc..a84e8a9 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 4ce6f9279d1c0c8d08c675784992782cf93ffdca Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 20 Aug 2012 12:37:03 -0700 Subject: Remove android.software.live_wallpaper.xml from PRODUCT_COPY_FILES Bug: 7019907 Change-Id: I5248e0b0522bc688e4f77a59672590ba298de3e5 --- device.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/device.mk b/device.mk index 3c343a4..0d86348 100644 --- a/device.mk +++ b/device.mk @@ -146,9 +146,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \ frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml -PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ -packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml) - # Melfas touchscreen firmware PRODUCT_COPY_FILES += \ device/samsung/tuna/mms144_ts_rev31.fw:system/vendor/firmware/mms144_ts_rev31.fw \ -- cgit v1.1 From 810cd871fdc1654fbb6c5e902a8afe60c0e8edfa Mon Sep 17 00:00:00 2001 From: Benoit Goby Date: Mon, 20 Aug 2012 12:45:30 -0700 Subject: tuna: prebuilt kernel 307b3aa1 misc: modem_if: link_mipi: add message break command recovery b19fa08 misc: modem_if: link_mipi: fix the missing of initialize recv_step for next rx 7152ad3 ARM: omap4: tuna: enable CONFIG_UHID in defconfig Bug: 6768080 Change-Id: I6bc602813c65e71ca0adfcf162a415d03233e237 --- kernel | Bin 4143232 -> 4145440 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 94d37f0..35a4c3e 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 1fcda24688b3a31babaf8e84aed9ae6fe0793f55 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 20 Aug 2012 13:21:11 -0700 Subject: Migrate sdcard0 to shell-accessible location. Bug: 7005701 Change-Id: I0c07505d9ccc2842186a00a4e96489063cc8c7e8 --- init.tuna.rc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/init.tuna.rc b/init.tuna.rc index bf91ed4..647e8e5 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -1,16 +1,20 @@ import init.tuna.usb.rc on init - mkdir /mnt/secure/sdcard0 0700 root root + mkdir /mnt/shell/sdcard0 0700 shell shell + # External storage path for apps export EXTERNAL_STORAGE /storage/sdcard0 + # External storage path for adb + export ADB_EXTERNAL_STORAGE /mnt/shell/sdcard0/0 + mkdir /storage 0711 root root mkdir /storage/sdcard0 0000 root root symlink /storage/sdcard0 /sdcard symlink /storage/sdcard0 /mnt/sdcard # Save bugreports as owner - export BUGREPORT_WRITE_PATH /mnt/secure/sdcard0/0 + export BUGREPORT_WRITE_PATH /mnt/shell/sdcard0/0 export BUGREPORT_READ_PATH /storage/sdcard0 on post-fs-data @@ -167,7 +171,7 @@ service smc_pa_wvdrm /system/bin/smc_pa_ctrl \ oneshot # virtual sdcard daemon running as media_rw (1023) -service sdcard /system/bin/sdcard /data/media /mnt/secure/sdcard0 1023 1023 +service sdcard /system/bin/sdcard /data/media /mnt/shell/sdcard0 1023 1023 class late_start service p2p_supplicant /system/bin/wpa_supplicant \ -- cgit v1.1 From 73c0d9500d21ff61d760bf91619618b24a649706 Mon Sep 17 00:00:00 2001 From: Matthew Xie Date: Fri, 17 Aug 2012 14:57:57 -0700 Subject: Revert "Add bthid device driver ko file. Init it as device driver node." UHID device in kernel is used instead of this driver. This reverts commit b5f88903c387b208629bcc04aad2c92f242e4144. --- bthid.ko | Bin 91186 -> 0 bytes device.mk | 3 --- init.tuna.rc | 5 ----- 3 files changed, 8 deletions(-) delete mode 100644 bthid.ko diff --git a/bthid.ko b/bthid.ko deleted file mode 100644 index a2d82a1..0000000 Binary files a/bthid.ko and /dev/null differ diff --git a/device.mk b/device.mk index 0d86348..113d97a 100644 --- a/device.mk +++ b/device.mk @@ -79,9 +79,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf -PRODUCT_COPY_FILES += \ - device/samsung/tuna/bthid.ko:system/lib/modules/bthid.ko - # Wifi ifneq ($(TARGET_PREBUILT_WIFI_MODULE),) PRODUCT_COPY_FILES += \ diff --git a/init.tuna.rc b/init.tuna.rc index 647e8e5..00a3865 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -54,11 +54,6 @@ on boot write /sys/bus/usb/devices/usb1/power/autosuspend_delay_ms 0 write /sys/bus/usb/devices/usb2/power/autosuspend_delay_ms 0 -# Start kernel driver (for BTHID) - insmod /system/lib/modules/bthid.ko - chmod 0660 /dev/bthid - chown bluetooth bluetooth /dev/bthid - on fs mkdir /factory 0775 radio radio mount_all /fstab.tuna -- cgit v1.1 From bd6aec2debc5aa267a72412d540b7419bc40f9c7 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Mon, 20 Aug 2012 16:28:38 -0700 Subject: Add support for per device bluetooth configuration. Bug: 6837125 Change-Id: I3c05e57703c02bb9981bd4628347cc7e3b060574 --- BoardConfig.mk | 5 ++++- bluetooth/bdroid_buildcfg.h | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 bluetooth/bdroid_buildcfg.h diff --git a/BoardConfig.mk b/BoardConfig.mk index 6df76b3..b07c668 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -21,6 +21,10 @@ USE_CAMERA_STUB := true # Use the non-open-source parts, if they're present -include vendor/samsung/tuna/BoardConfigVendor.mk +# Default values, if not overridden else where. +TARGET_BOARD_INFO_FILE ?= device/samsung/tuna/board-info.txt +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR ?= device/samsung/tuna/bluetooth + TARGET_CPU_ABI := armeabi-v7a TARGET_CPU_ABI2 := armeabi TARGET_CPU_SMP := true @@ -36,7 +40,6 @@ BOARD_KERNEL_BASE := 0x80000000 TARGET_NO_RADIOIMAGE := true TARGET_BOARD_PLATFORM := omap4 TARGET_BOOTLOADER_BOARD_NAME := tuna -TARGET_BOARD_INFO_FILE ?= device/samsung/tuna/board-info.txt BOARD_EGL_CFG := device/samsung/tuna/egl.cfg BOARD_CREATE_TUNA_HDCP_KEYS_SYMLINK := true diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h new file mode 100644 index 0000000..5c61b6c --- /dev/null +++ b/bluetooth/bdroid_buildcfg.h @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef _BDROID_BUILDCFG_H +#define _BDROID_BUILDCFG_H + +#define BTM_DEF_LOCAL_NAME "Galaxy Nexus 2" + +#endif -- cgit v1.1 From e8c14ab3ef1718ddae9ef56abc670878877cc2a5 Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Mon, 20 Aug 2012 17:55:34 -0700 Subject: tuna: prebuilt kernel (shutdown hang) 313293e Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 f87901e Merge branch 'android-3.0' into android-omap-3.0 8f4d8bd ARM: disable preemption in machine_shutdown Change-Id: I4c2a5033c55c712c618397454f39b57048229edd --- kernel | Bin 4145440 -> 4145400 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 35a4c3e..76fe9fb 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 8bf9bea8cb1867e227a640f98b084a4330602d70 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Tue, 7 Aug 2012 14:10:40 -0700 Subject: Triple buffer if SRC enabled Bug: 6881638 Change-Id: I76255c2cd5845671c2342e22932c692342257208 --- audio/audio_hw.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 8ae519c..b841c57 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -180,6 +180,11 @@ */ #ifdef PLAYBACK_MMAP #define PLAYBACK_SHORT_PERIOD_COUNT 4 +/* If sample rate converter is required, then use triple-buffering to + * help mask the variance in cycle times. Otherwise use double-buffering. + */ +#elif DEFAULT_OUT_SAMPLING_RATE != MM_FULL_POWER_SAMPLING_RATE +#define PLAYBACK_SHORT_PERIOD_COUNT 3 #else #define PLAYBACK_SHORT_PERIOD_COUNT 2 #endif @@ -297,6 +302,7 @@ enum tty_modes { TTY_MODE_FULL }; +/* deep buffer */ struct pcm_config pcm_config_mm = { .channels = 2, .rate = MM_FULL_POWER_SAMPLING_RATE, @@ -307,6 +313,7 @@ struct pcm_config pcm_config_mm = { .avail_min = DEEP_BUFFER_LONG_PERIOD_SIZE, }; +/* low latency */ struct pcm_config pcm_config_tones = { .channels = 2, .rate = MM_FULL_POWER_SAMPLING_RATE, -- cgit v1.1 From baaaeb0278566694207ab70cd6f75c80179762a4 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 21 Aug 2012 10:36:20 -0700 Subject: Iteration on multi-user external storage. Symlink to make /sdcard work for shell users. Environment variable to find root of multiuser SD card. Bug: 6925012 Change-Id: Ia190a609a3b04357a7acb8fe630971bb13aab249 --- init.tuna.rc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/init.tuna.rc b/init.tuna.rc index 00a3865..98be753 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -1,15 +1,14 @@ import init.tuna.usb.rc on init + # See storage config details at http://source.android.com/tech/storage/ mkdir /mnt/shell/sdcard0 0700 shell shell - # External storage path for apps export EXTERNAL_STORAGE /storage/sdcard0 - # External storage path for adb - export ADB_EXTERNAL_STORAGE /mnt/shell/sdcard0/0 + export MULTIUSER_EXTERNAL_STORAGE /mnt/shell/sdcard0 - mkdir /storage 0711 root root - mkdir /storage/sdcard0 0000 root root + # Support legacy paths + symlink /mnt/shell/sdcard0/0 /storage/sdcard0 symlink /storage/sdcard0 /sdcard symlink /storage/sdcard0 /mnt/sdcard -- cgit v1.1 From 559a942e6efe21b5beb83c7db50f0986bacfabe2 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Tue, 7 Aug 2012 15:31:20 -0700 Subject: Use 3 ms buffers for low latency path Change-Id: Icf113e2e863a79cb3d870fac5781539702cdbfa8 --- audio/audio_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/audio_hw.c b/audio/audio_hw.c index b841c57..f2fda76 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -127,7 +127,7 @@ /* #define to use mmap no-irq mode for playback, #undef for non-mmap irq mode */ #undef PLAYBACK_MMAP // was #define /* short period (aka low latency) in milliseconds */ -#define SHORT_PERIOD_MS 4 // was 22 +#define SHORT_PERIOD_MS 3 // was 22 /* deep buffer short period (screen on) in milliseconds */ #define DEEP_BUFFER_SHORT_PERIOD_MS 22 /* deep buffer long period (screen off) in milliseconds */ -- cgit v1.1 From 889bf716e5da781cf040f57cc566fb98b6b79551 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Mon, 27 Aug 2012 16:26:44 -0700 Subject: tuna: kernel prebuilt 63535ce Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 bf7dde6 Merge branch 'android-3.0' into android-omap-3.0 8b056dd net: wireless: bcmdhd: Update to version 5.90.195.104 26ae87e cfg80211: allow registering to beacons 8234215 nl80211: add API to probe a client eef4c1e nl80211: allow subscribing to unexpected class3 frames 6c3e830 nl80211: advertise device AP SME 1bd42d5 nl80211: advertise GTK rekey support, new triggers e350606 nl80211: support sending TDLS commands/frames 931201c cfg80211/nl80211: Add PMKSA caching candidate event 97ce108 cfg80211/nl80211: support GTK rekey offload eca0e76 net: wireless: bcmdhd: Remove WIPHY_FLAG_SUPPORTS_FW_ROAM flag 50701ac net: wireless: bcmdhd: Remove PMKID_CACHE and TXFAIL events for CFG80211 c0ff1e2 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 fde9052 Merge branch 'android-3.0' into android-omap-3.0 eb3cd50 net: wireless: bcmdhd: Update to Version 5.90.195.98 Change-Id: I44d8534ace1aba594c33fb80f2db855bc42560ef Signed-off-by: Dmitry Shmidt --- kernel | Bin 4145400 -> 4148084 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 76fe9fb..8c0057b 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 9111281e0b97470baecc644c3c957a91880b6fd2 Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Tue, 28 Aug 2012 20:06:33 -0700 Subject: tuna: prebuilt kernel (netfilter, wifi) 581b972 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 439b66b Merge branch 'android-3.0' into android-omap-3.0 1dfbc28 netfilter: xt_qtaguid: report only uid tags to non-privileged processes ddb45c7 net: wireless: bcmdhd: Fix sending ctrl packet d7cdb87 net: wireless: bcmdhd: Add ASSOC event processing Change-Id: Ic0cd79adbcb9bfbf0882e41270cb950ce5b260fa --- kernel | Bin 4148084 -> 4148048 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 8c0057b..861a1b2 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 31e4ba0ec1238bbef3761bc28dcfcc7ff76e8e01 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 30 Aug 2012 09:28:25 -0700 Subject: make_ext4fs has moved to build/target/core.mk There's no need to add make_ext4fs to each device since it's in build/target/core.mk since commit 720479ea7e6307648c56f61d82ac12d65f218dda Bug: 6960586 Change-Id: I916b06e9d696764d1944d3c911ab75f4ef34fb7d --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 113d97a..2c4c3e4 100644 --- a/device.mk +++ b/device.mk @@ -191,7 +191,6 @@ PRODUCT_PACKAGES += \ # Filesystem management tools PRODUCT_PACKAGES += \ - make_ext4fs \ e2fsck \ setup_fs -- cgit v1.1 From 69645ac722fd3eda7b96cac149166fa7ab502fc5 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Thu, 30 Aug 2012 11:20:32 -0700 Subject: audio: fix echo reference channels configuration When an auxiliary mic channel is used, the echo reference should use only the main channels to be consistent with the way the reverse effect processing is configured. Change-Id: I28ee1e2a9852fdd0e904fb01bedf90f3372683c9 --- audio/audio_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/audio_hw.c b/audio/audio_hw.c index f2fda76..2caba05 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -2202,7 +2202,7 @@ static int start_input_stream(struct tuna_stream_in *in) if (in->need_echo_reference && in->echo_reference == NULL) in->echo_reference = get_echo_reference(adev, AUDIO_FORMAT_PCM_16_BIT, - in->config.channels, + popcount(in->main_channels), in->requested_rate); /* this assumes routing is done previously */ -- cgit v1.1 From e16d1caba7c837d4e68ff686981f822afb651705 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Wed, 5 Sep 2012 16:02:26 -0700 Subject: Remove /sdcard hack for shell users. Using a /storage/sdcard0 symlink and a tmpfs staging area was used to enable "/sdcard" paths for both zygote processes and the shell user, but it breaks on devices with both emulated and physical external storage. Specifically, vold can't mount a physical sdcard onto the primary storage symlink, and zygote can't re-bind-mount when secondary storage is remounted after dropping privileges. Bug: 7094858, 7064600 Change-Id: Ic9821129f94c22d0c64e84d8ee9f55d505a78e5d --- init.tuna.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.tuna.rc b/init.tuna.rc index 98be753..a55d833 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -3,12 +3,12 @@ import init.tuna.usb.rc on init # See storage config details at http://source.android.com/tech/storage/ mkdir /mnt/shell/sdcard0 0700 shell shell + mkdir /storage/sdcard0 0000 root root export EXTERNAL_STORAGE /storage/sdcard0 export MULTIUSER_EXTERNAL_STORAGE /mnt/shell/sdcard0 # Support legacy paths - symlink /mnt/shell/sdcard0/0 /storage/sdcard0 symlink /storage/sdcard0 /sdcard symlink /storage/sdcard0 /mnt/sdcard -- cgit v1.1 From d46c45ffb6ead626e9bbe9a03c489bde035a278b Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 6 Sep 2012 13:18:55 -0700 Subject: Bring back ADB_EXTERNAL_STORAGE. Bug: 7119408 Change-Id: Ia08146965ee6218a033a70c2f02cbc621e339316 --- init.tuna.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/init.tuna.rc b/init.tuna.rc index a55d833..530330f 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -6,6 +6,7 @@ on init mkdir /storage/sdcard0 0000 root root export EXTERNAL_STORAGE /storage/sdcard0 + export ADB_EXTERNAL_STORAGE /mnt/shell/sdcard0/0 export MULTIUSER_EXTERNAL_STORAGE /mnt/shell/sdcard0 # Support legacy paths -- cgit v1.1 From 0695fa805dbfafe56d4909d873f4774385225040 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 6 Sep 2012 13:18:55 -0700 Subject: Bring back ADB_EXTERNAL_STORAGE. Bug: 7119408 Change-Id: Ia08146965ee6218a033a70c2f02cbc621e339316 --- init.tuna.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/init.tuna.rc b/init.tuna.rc index a55d833..530330f 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -6,6 +6,7 @@ on init mkdir /storage/sdcard0 0000 root root export EXTERNAL_STORAGE /storage/sdcard0 + export ADB_EXTERNAL_STORAGE /mnt/shell/sdcard0/0 export MULTIUSER_EXTERNAL_STORAGE /mnt/shell/sdcard0 # Support legacy paths -- cgit v1.1 From 7530b97de5f19737e895e9069792940ad8ce66a5 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Tue, 28 Aug 2012 14:24:38 -0700 Subject: audio: changes for new audio device enums Modifications for new audio device enums: - Separated input and output device fields as output and input device values are now on 32 bits. - Changed audio device API version to 2.0 Also removed get_supported_devices() function not needed if audio_policy.conf file is present. Change-Id: I41b782e7450b4664048cc484a681b9327d8395da --- audio/audio_hw.c | 112 +++++++++++++++++++++---------------------------------- 1 file changed, 43 insertions(+), 69 deletions(-) diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 2caba05..5b5e03e 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -645,7 +645,8 @@ struct tuna_audio_device { struct mixer *mixer; struct mixer_ctls mixer_ctls; audio_mode_t mode; - int devices; + int out_device; + int in_device; struct pcm *pcm_modem_dl; struct pcm *pcm_modem_ul; int in_call; @@ -875,7 +876,7 @@ static void end_call(struct tuna_audio_device *adev) static void set_eq_filter(struct tuna_audio_device *adev) { /* DL1_EQ can't be used for bt */ - int dl1_eq_applicable = adev->devices & (AUDIO_DEVICE_OUT_WIRED_HEADSET | + int dl1_eq_applicable = adev->out_device & (AUDIO_DEVICE_OUT_WIRED_HEADSET | AUDIO_DEVICE_OUT_WIRED_HEADPHONE | AUDIO_DEVICE_OUT_EARPIECE); /* 4Khz LPF is used only in NB-AMR voicecall */ @@ -908,7 +909,7 @@ static void set_incall_device(struct tuna_audio_device *adev) { int device_type; - switch(adev->devices & AUDIO_DEVICE_OUT_ALL) { + switch(adev->out_device) { case AUDIO_DEVICE_OUT_EARPIECE: device_type = SOUND_AUDIO_PATH_HANDSET; break; @@ -997,8 +998,8 @@ static void set_output_volumes(struct tuna_audio_device *adev, bool tty_volume) int headset_volume; int earpiece_volume; bool toro = adev->device_is_toro; - int headphone_on = adev->devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE; - int speaker_on = adev->devices & AUDIO_DEVICE_OUT_SPEAKER; + int headphone_on = adev->out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE; + int speaker_on = adev->out_device & AUDIO_DEVICE_OUT_SPEAKER; int speaker_volume_overrange = MIXER_ABE_GAIN_0DB; int speaker_max_db = DB_FROM_SPEAKER_VOLUME(mixer_ctl_get_range_max(adev->mixer_ctls.speaker_volume)); @@ -1049,7 +1050,7 @@ static void set_output_volumes(struct tuna_audio_device *adev, bool tty_volume) */ if (headphone_on) dl1_volume_correction = normal_headphone_volume - headset_volume; - else if (adev->devices & AUDIO_DEVICE_OUT_WIRED_HEADSET) + else if (adev->out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET) dl1_volume_correction = normal_headset_volume - headset_volume; else dl1_volume_correction = normal_earpiece_volume - earpiece_volume; @@ -1138,15 +1139,15 @@ static void select_mode(struct tuna_audio_device *adev) after the ringtone is played, but doesn't cause a route change if a headset or bt device is already connected. If speaker is not the only thing active, just remove it from - the route. We'll assume it'll never be used initally during + the route. We'll assume it'll never be used initially during a call. This works because we're sure that the audio policy manager will update the output device after the audio mode change, even if the device selection did not change. */ - if ((adev->devices & AUDIO_DEVICE_OUT_ALL) == AUDIO_DEVICE_OUT_SPEAKER) - adev->devices = AUDIO_DEVICE_OUT_EARPIECE | - AUDIO_DEVICE_IN_BUILTIN_MIC; - else - adev->devices &= ~AUDIO_DEVICE_OUT_SPEAKER; + if (adev->out_device == AUDIO_DEVICE_OUT_SPEAKER) { + adev->out_device = AUDIO_DEVICE_OUT_EARPIECE; + adev->in_device = AUDIO_DEVICE_IN_BUILTIN_MIC & ~AUDIO_DEVICE_BIT_IN; + } else + adev->out_device &= ~AUDIO_DEVICE_OUT_SPEAKER; select_output_device(adev); start_call(adev); ril_set_call_volume(&adev->ril, SOUND_TYPE_VOICE, adev->voice_volume); @@ -1186,11 +1187,11 @@ static void select_output_device(struct tuna_audio_device *adev) channel, 0); } - headset_on = adev->devices & AUDIO_DEVICE_OUT_WIRED_HEADSET; - headphone_on = adev->devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE; - speaker_on = adev->devices & AUDIO_DEVICE_OUT_SPEAKER; - earpiece_on = adev->devices & AUDIO_DEVICE_OUT_EARPIECE; - bt_on = adev->devices & AUDIO_DEVICE_OUT_ALL_SCO; + headset_on = adev->out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET; + headphone_on = adev->out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE; + speaker_on = adev->out_device & AUDIO_DEVICE_OUT_SPEAKER; + earpiece_on = adev->out_device & AUDIO_DEVICE_OUT_EARPIECE; + bt_on = adev->out_device & AUDIO_DEVICE_OUT_ALL_SCO; /* force rx path according to TTY mode when in call */ if (adev->mode == AUDIO_MODE_IN_CALL && !bt_on) { @@ -1215,7 +1216,7 @@ static void select_output_device(struct tuna_audio_device *adev) default: /* force speaker on when in call and HDMI or S/PDIF is selected * as voice DL audio cannot be routed there by ABE */ - if (adev->devices & + if (adev->out_device & (AUDIO_DEVICE_OUT_AUX_DIGITAL | AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) speaker_on = 1; @@ -1315,18 +1316,18 @@ static void select_input_device(struct tuna_audio_device *adev) int headset_on = 0; int main_mic_on = 0; int sub_mic_on = 0; - int bt_on = adev->devices & AUDIO_DEVICE_IN_ALL_SCO; + int bt_on = adev->in_device & AUDIO_DEVICE_IN_ALL_SCO; if (!bt_on) { if ((adev->mode != AUDIO_MODE_IN_CALL) && (adev->active_input != 0)) { /* sub mic is used for camcorder or VoIP on speaker phone */ sub_mic_on = (adev->active_input->source == AUDIO_SOURCE_CAMCORDER) || - ((adev->devices & AUDIO_DEVICE_OUT_SPEAKER) && + ((adev->out_device & AUDIO_DEVICE_OUT_SPEAKER) && (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION)); } if (!sub_mic_on) { - headset_on = adev->devices & AUDIO_DEVICE_IN_WIRED_HEADSET; - main_mic_on = adev->devices & AUDIO_DEVICE_IN_BUILTIN_MIC; + headset_on = adev->in_device & AUDIO_DEVICE_IN_WIRED_HEADSET; + main_mic_on = adev->in_device & AUDIO_DEVICE_IN_BUILTIN_MIC; } } @@ -1395,8 +1396,7 @@ static int start_output_stream_low_latency(struct tuna_stream_out *out) * tinyalsa. */ - if (adev->devices & (AUDIO_DEVICE_OUT_ALL & - ~(AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET | AUDIO_DEVICE_OUT_AUX_DIGITAL))) { + if (adev->out_device & ~(AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET | AUDIO_DEVICE_OUT_AUX_DIGITAL)) { /* Something not a dock in use */ out->config[PCM_NORMAL] = pcm_config_tones; out->config[PCM_NORMAL].rate = MM_FULL_POWER_SAMPLING_RATE; @@ -1404,7 +1404,7 @@ static int start_output_stream_low_latency(struct tuna_stream_out *out) flags, &out->config[PCM_NORMAL]); } - if (adev->devices & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET) { + if (adev->out_device & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET) { /* SPDIF output in use */ out->config[PCM_SPDIF] = pcm_config_tones; out->config[PCM_SPDIF].rate = MM_FULL_POWER_SAMPLING_RATE; @@ -1413,7 +1413,7 @@ static int start_output_stream_low_latency(struct tuna_stream_out *out) } /* priority is given to multichannel HDMI output */ - if ((adev->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL) && + if ((adev->out_device & AUDIO_DEVICE_OUT_AUX_DIGITAL) && (adev->outputs[OUTPUT_HDMI] == NULL || adev->outputs[OUTPUT_HDMI]->standby)) { /* HDMI output in use */ out->config[PCM_HDMI] = pcm_config_tones; @@ -1792,7 +1792,7 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) val = atoi(value); pthread_mutex_lock(&adev->lock); pthread_mutex_lock(&out->lock); - if (((adev->devices & AUDIO_DEVICE_OUT_ALL) != val) && (val != 0)) { + if ((adev->out_device != val) && (val != 0)) { /* this is needed only when changing device on low latency output * as other output streams are not used for voice use cases nor * handle duplication to HDMI or SPDIF */ @@ -1811,26 +1811,25 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) * (several hundred ms of audio can be lost: e.g beginning of a ringtone. We must understand * the root cause in audio HAL, driver or ABE. if (((val & AUDIO_DEVICE_OUT_AUX_DIGITAL) ^ - (adev->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL)) || + (adev->out_device & AUDIO_DEVICE_OUT_AUX_DIGITAL)) || ((val & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET) ^ - (adev->devices & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) || - (adev->devices & (AUDIO_DEVICE_OUT_AUX_DIGITAL | + (adev->out_device & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) || + (adev->out_device & (AUDIO_DEVICE_OUT_AUX_DIGITAL | AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET))) */ if (((val & AUDIO_DEVICE_OUT_AUX_DIGITAL) ^ - (adev->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL)) || + (adev->out_device & AUDIO_DEVICE_OUT_AUX_DIGITAL)) || ((val & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET) ^ - (adev->devices & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) || - (adev->devices & (AUDIO_DEVICE_OUT_AUX_DIGITAL | + (adev->out_device & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) || + (adev->out_device & (AUDIO_DEVICE_OUT_AUX_DIGITAL | AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) || ((val & AUDIO_DEVICE_OUT_SPEAKER) ^ - (adev->devices & AUDIO_DEVICE_OUT_SPEAKER)) || + (adev->out_device & AUDIO_DEVICE_OUT_SPEAKER)) || (adev->mode == AUDIO_MODE_IN_CALL)) do_output_standby(out); } if (out != adev->outputs[OUTPUT_HDMI]) { - adev->devices &= ~AUDIO_DEVICE_OUT_ALL; - adev->devices |= val; + adev->out_device = val; select_output_device(adev); } } @@ -2173,8 +2172,7 @@ static int start_input_stream(struct tuna_stream_in *in) adev->active_input = in; if (adev->mode != AUDIO_MODE_IN_CALL) { - adev->devices &= ~AUDIO_DEVICE_IN_ALL; - adev->devices |= in->device; + adev->in_device = in->device; select_input_device(adev); } @@ -2275,7 +2273,7 @@ static int do_input_standby(struct tuna_stream_in *in) adev->active_input = 0; if (adev->mode != AUDIO_MODE_IN_CALL) { - adev->devices &= ~AUDIO_DEVICE_IN_ALL; + adev->in_device = AUDIO_DEVICE_NONE; select_input_device(adev); } @@ -2336,7 +2334,7 @@ static int in_set_parameters(struct audio_stream *stream, const char *kvpairs) ret = str_parms_get_str(parms, AUDIO_PARAMETER_STREAM_ROUTING, value, sizeof(value)); if (ret >= 0) { - val = atoi(value); + val = atoi(value) & ~AUDIO_DEVICE_BIT_IN; if ((in->device != val) && (val != 0)) { in->device = val; do_standby = true; @@ -3305,8 +3303,7 @@ static int adev_open_output_stream(struct audio_hw_device *dev, /* FIXME: when we support multiple output devices, we will want to * do the following: - * adev->devices &= ~AUDIO_DEVICE_OUT_ALL; - * adev->devices |= out->device; + * adev->out_device = out->device; * select_output_device(adev); * This is because out_set_parameters() with a route is not * guaranteed to be called after an output stream is opened. */ @@ -3537,7 +3534,7 @@ static int adev_open_input_stream(struct audio_hw_device *dev, in->dev = ladev; in->standby = 1; - in->device = devices; + in->device = devices & ~AUDIO_DEVICE_BIT_IN; *stream_in = &in->stream; return 0; @@ -3594,29 +3591,6 @@ static int adev_close(hw_device_t *device) return 0; } -static uint32_t adev_get_supported_devices(const struct audio_hw_device *dev) -{ - return (/* OUT */ - AUDIO_DEVICE_OUT_EARPIECE | - AUDIO_DEVICE_OUT_SPEAKER | - AUDIO_DEVICE_OUT_WIRED_HEADSET | - AUDIO_DEVICE_OUT_WIRED_HEADPHONE | - AUDIO_DEVICE_OUT_AUX_DIGITAL | - AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET | - AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET | - AUDIO_DEVICE_OUT_ALL_SCO | - AUDIO_DEVICE_OUT_DEFAULT | - /* IN */ - AUDIO_DEVICE_IN_COMMUNICATION | - AUDIO_DEVICE_IN_AMBIENT | - AUDIO_DEVICE_IN_BUILTIN_MIC | - AUDIO_DEVICE_IN_WIRED_HEADSET | - AUDIO_DEVICE_IN_AUX_DIGITAL | - AUDIO_DEVICE_IN_BACK_MIC | - AUDIO_DEVICE_IN_ALL_SCO | - AUDIO_DEVICE_IN_DEFAULT); -} - static int adev_open(const hw_module_t* module, const char* name, hw_device_t** device) { @@ -3631,11 +3605,10 @@ static int adev_open(const hw_module_t* module, const char* name, return -ENOMEM; adev->hw_device.common.tag = HARDWARE_DEVICE_TAG; - adev->hw_device.common.version = AUDIO_DEVICE_API_VERSION_1_0; + adev->hw_device.common.version = AUDIO_DEVICE_API_VERSION_2_0; adev->hw_device.common.module = (struct hw_module_t *) module; adev->hw_device.common.close = adev_close; - adev->hw_device.get_supported_devices = adev_get_supported_devices; adev->hw_device.init_check = adev_init_check; adev->hw_device.set_voice_volume = adev_set_voice_volume; adev->hw_device.set_master_volume = adev_set_master_volume; @@ -3741,7 +3714,8 @@ static int adev_open(const hw_module_t* module, const char* name, pthread_mutex_lock(&adev->lock); set_route_by_array(adev->mixer, defaults, 1); adev->mode = AUDIO_MODE_NORMAL; - adev->devices = AUDIO_DEVICE_OUT_SPEAKER | AUDIO_DEVICE_IN_BUILTIN_MIC; + adev->out_device = AUDIO_DEVICE_OUT_SPEAKER; + adev->in_device = AUDIO_DEVICE_IN_BUILTIN_MIC & ~AUDIO_DEVICE_BIT_IN; select_output_device(adev); adev->pcm_modem_dl = NULL; -- cgit v1.1 From c64cb757360d1b46e6e658802297547f07d8d75d Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Fri, 7 Sep 2012 14:45:57 -0700 Subject: tuna: Kernel prebuilt 95b8c1c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 ab5f2d3 Merge branch 'android-3.0' into android-omap-3.0 6a5fe81 net: wireless: bcmdhd: Report proper mcs rate mask Change-Id: I765d09d50940cef2b927359cc1bb6a8fc3f23332 Signed-off-by: Dmitry Shmidt --- kernel | Bin 4148048 -> 4148132 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 861a1b2..cc0938b 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From e71d570bb84a80c9543e0797c0a9bf2082ac88f5 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 7 Sep 2012 11:56:12 -0700 Subject: audio: fix string leakage in out_get_parameters() out_get_parameters() was calling strdup() on the string returned by str_parms_to_str() before returning it to the caller. This creates a new string which is never freed as str_parms_to_str() already allocates a new string. Change-Id: I4bcc4aa17ab55e830d7a0569151f717422f6459b --- audio/audio_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 5b5e03e..4206893 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -1877,7 +1877,7 @@ static char * out_get_parameters(const struct audio_stream *stream, const char * i++; } str_parms_add_str(reply, AUDIO_PARAMETER_STREAM_SUP_CHANNELS, value); - str = strdup(str_parms_to_str(reply)); + str = str_parms_to_str(reply); } else { str = strdup(keys); } -- cgit v1.1 From 00e4a3392f88ed7b67ef2e74f69f9cae0a911d23 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 7 Sep 2012 17:28:50 -0700 Subject: audio: add device specific audio_effects.conf file The audio pre processings are not included in the default audio_effect.conf file anymore as the audio HAL has to provide support for them. Add a device specific audio_effects.conf exposing what is supported by crespo. Change-Id: I0136ebfe3e44c757b127ce9daf01f54be441badd --- audio_effects.conf | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++ device.mk | 4 +- 2 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 audio_effects.conf diff --git a/audio_effects.conf b/audio_effects.conf new file mode 100644 index 0000000..d681c69 --- /dev/null +++ b/audio_effects.conf @@ -0,0 +1,133 @@ +# List of effect libraries to load. Each library element must contain a "path" element +# giving the full path of the library .so file. +# libraries { +# { +# path +# } +# } +libraries { + bundle { + path /system/lib/soundfx/libbundlewrapper.so + } + reverb { + path /system/lib/soundfx/libreverbwrapper.so + } + visualizer { + path /system/lib/soundfx/libvisualizer.so + } + pre_processing { + path /system/lib/soundfx/libaudiopreprocessing.so + } + downmix { + path /system/lib/soundfx/libdownmix.so + } +} + +# list of effects to load. Each effect element must contain a "library" and a "uuid" element. +# The value of the "library" element must correspond to the name of one library element in the +# "libraries" element. +# The name of the effect element is indicative, only the value of the "uuid" element +# designates the effect. +# The uuid is the implementation specific UUID as specified by the effect vendor. This is not the +# generic effect type UUID. +# effects { +# { +# library +# uuid +# } +# ... +# } + +effects { + bassboost { + library bundle + uuid 8631f300-72e2-11df-b57e-0002a5d5c51b + } + virtualizer { + library bundle + uuid 1d4033c0-8557-11df-9f2d-0002a5d5c51b + } + equalizer { + library bundle + uuid ce772f20-847d-11df-bb17-0002a5d5c51b + } + volume { + library bundle + uuid 119341a0-8469-11df-81f9-0002a5d5c51b + } + reverb_env_aux { + library reverb + uuid 4a387fc0-8ab3-11df-8bad-0002a5d5c51b + } + reverb_env_ins { + library reverb + uuid c7a511a0-a3bb-11df-860e-0002a5d5c51b + } + reverb_pre_aux { + library reverb + uuid f29a1400-a3bb-11df-8ddc-0002a5d5c51b + } + reverb_pre_ins { + library reverb + uuid 172cdf00-a3bc-11df-a72f-0002a5d5c51b + } + visualizer { + library visualizer + uuid d069d9e0-8329-11df-9168-0002a5d5c51b + } + downmix { + library downmix + uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f + } + agc { + library pre_processing + uuid aa8130e0-66fc-11e0-bad0-0002a5d5c51b + } + aec { + library pre_processing + uuid bb392ec0-8d4d-11e0-a896-0002a5d5c51b + } + ns { + library pre_processing + uuid c06c8400-8e06-11e0-9cb6-0002a5d5c51b + } +} +# Audio preprocessor configurations. +# The pre processor configuration consists in a list of elements each describing +# pre processor settings for a given input source. Valid input source names are: +# "mic", "camcorder", "voice_recognition", "voice_communication" +# Each input source element contains a list of effects elements. The name of the effect +# element must be the name of one of the effects in the "effects" list of the file. +# Each effect element may optionally contain a list of parameters and their +# default value to apply when the pre processor effect is created. +# A parameter is defined by a "param" element and a "value" element. Each of these elements +# consists in one or more elements specifying a type followed by a value. +# The types defined are: "int", "short", "float", "bool" and "string" +# When both "param" and "value" are a single int, a simple form is allowed where just +# the param and value pair is present in the parameter description +# pre_processing { +# { +# { +# { +# param { +# int|short|float|bool|string +# [ int|short|float|bool|string ] +# ... +# } +# value { +# int|short|float|bool|string +# [ int|short|float|bool|string ] +# ... +# } +# } +# { } +# ... +# } +# ... +# } +# ... +# } + +# +# TODO: add default audio pre processor configurations after debug and tuning phase +# diff --git a/device.mk b/device.mk index 2c4c3e4..864b5dd 100644 --- a/device.mk +++ b/device.mk @@ -56,8 +56,8 @@ PRODUCT_PACKAGES += \ audio.usb.default PRODUCT_COPY_FILES += \ - device/samsung/tuna/audio/audio_policy.conf:system/etc/audio_policy.conf - + device/samsung/tuna/audio/audio_policy.conf:system/etc/audio_policy.conf \ + device/samsung/tuna/audio_effects.conf:system/vendor/etc/audio_effects.conf PRODUCT_PACKAGES += \ tuna_hdcp_keys -- cgit v1.1 From adca85d21828c33c277f1e27e1f31a5d8a2d30e9 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Mon, 10 Sep 2012 14:01:21 -0700 Subject: tuna: Kernel prebuilt 4f6d371 net: wireless: bcmdhd: Report proper mcs rate mask BUG: b/7103180 Change-Id: Icd315e735cc7ca3e6519af6a216c718280ced292 Signed-off-by: Dmitry Shmidt --- kernel | Bin 4143196 -> 4143200 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index a08cf49..48a5610 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From d59ae3bd78af43ad2ae099da26c4053c877a42ee Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Mon, 10 Sep 2012 14:01:21 -0700 Subject: tuna: Kernel prebuilt 4f6d371 net: wireless: bcmdhd: Report proper mcs rate mask BUG: b/7103180 Change-Id: Icd315e735cc7ca3e6519af6a216c718280ced292 Signed-off-by: Dmitry Shmidt --- kernel | Bin 4143196 -> 4143200 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index a08cf49..48a5610 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From c7f6720e90b897a02e9452aff6d7bb53fc2fa944 Mon Sep 17 00:00:00 2001 From: Dima Zavin Date: Tue, 11 Sep 2012 14:59:23 -0700 Subject: tuna: Update kernel prebuilt 53f638c input: mms_ts: max x/y are max coordinates, not the x/y size Bug: 7138667 Change-Id: I8eefae22ad50657f5270c06ae0c6917bd5ccd85e Signed-off-by: Dima Zavin --- kernel | Bin 4148132 -> 4148268 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index cc0938b..43fa293 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From e8378f43b0d6d25b6a306cd0ac0c4cdcb12aa7a8 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Tue, 11 Sep 2012 15:13:26 -0700 Subject: No multiuser settings for phones Change-Id: I22300346f05d066db65e43cdd699f5dbc910b515 --- overlay/packages/apps/Settings/res/values/bools.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml index 711eb51..b5e8b7b 100644 --- a/overlay/packages/apps/Settings/res/values/bools.xml +++ b/overlay/packages/apps/Settings/res/values/bools.xml @@ -17,6 +17,4 @@ true - - true -- cgit v1.1 From 5bc53d51b5594b748880b3c5b12cd9ac635b2c8b Mon Sep 17 00:00:00 2001 From: Madan Ankapura Date: Sat, 8 Sep 2012 19:26:40 -0700 Subject: rename torospr to toroplus Bug: 6940653 Change-Id: I4cf7cc5a9f4acdc53f1d1ec13c586faf448d6645 Signed-off-by: Madan Ankapura --- recovery/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recovery/Android.mk b/recovery/Android.mk index 770feee..72cd80e 100644 --- a/recovery/Android.mk +++ b/recovery/Android.mk @@ -1,4 +1,4 @@ -ifneq (,$(findstring $(TARGET_DEVICE),tuna toro torospr maguro)) +ifneq (,$(findstring $(TARGET_DEVICE),tuna toro toroplus maguro)) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -- cgit v1.1 From 260f6e0aac21567ddf16390e9b0206f923d5081f Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 11 Sep 2012 23:18:48 -0700 Subject: Include user identifier in external storage paths. When building external storage paths, always include user in path to enable cross-user paths and aid debugging. Bug: 7131382 Change-Id: Ic065fb8739a9d5d6e7f88ab93932391d906fed57 --- init.tuna.rc | 23 +++++++++++--------- .../base/core/res/res/xml/storage_list.xml | 25 ++++++---------------- 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/init.tuna.rc b/init.tuna.rc index 530330f..c850128 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -2,20 +2,23 @@ import init.tuna.usb.rc on init # See storage config details at http://source.android.com/tech/storage/ - mkdir /mnt/shell/sdcard0 0700 shell shell - mkdir /storage/sdcard0 0000 root root + mkdir /mnt/shell/emulated 0700 shell shell + mkdir /storage/emulated 0000 root root + mkdir /storage/emulated_legacy 0000 root root - export EXTERNAL_STORAGE /storage/sdcard0 - export ADB_EXTERNAL_STORAGE /mnt/shell/sdcard0/0 - export MULTIUSER_EXTERNAL_STORAGE /mnt/shell/sdcard0 + export EXTERNAL_STORAGE /storage/emulated_legacy + export ADB_EXTERNAL_STORAGE /mnt/shell/emulated/0 + + export EMULATED_STORAGE_SOURCE /mnt/shell/emulated + export EMULATED_STORAGE_TARGET /storage/emulated # Support legacy paths - symlink /storage/sdcard0 /sdcard - symlink /storage/sdcard0 /mnt/sdcard + symlink /storage/emulated_legacy /sdcard + symlink /storage/emulated_legacy /mnt/sdcard # Save bugreports as owner - export BUGREPORT_WRITE_PATH /mnt/shell/sdcard0/0 - export BUGREPORT_READ_PATH /storage/sdcard0 + export BUGREPORT_WRITE_PATH /mnt/shell/emulated/0 + export BUGREPORT_READ_PATH /storage/emulated on post-fs-data mkdir /data/media 0770 media_rw media_rw @@ -166,7 +169,7 @@ service smc_pa_wvdrm /system/bin/smc_pa_ctrl \ oneshot # virtual sdcard daemon running as media_rw (1023) -service sdcard /system/bin/sdcard /data/media /mnt/shell/sdcard0 1023 1023 +service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023 class late_start service p2p_supplicant /system/bin/wpa_supplicant \ diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml index 0a03928..344fe1e 100644 --- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml +++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml @@ -17,25 +17,12 @@ */ --> - + - + + -- cgit v1.1 From 826bac872817bcc3bb3fb134b9eaa9b88e1b3f92 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 13 Sep 2012 02:29:21 -0700 Subject: One more legacy symlink. Change-Id: If598bb76fc760c7f12dcf9a5ff865508106e73d0 --- init.tuna.rc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/init.tuna.rc b/init.tuna.rc index c850128..af3c88d 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -15,10 +15,7 @@ on init # Support legacy paths symlink /storage/emulated_legacy /sdcard symlink /storage/emulated_legacy /mnt/sdcard - - # Save bugreports as owner - export BUGREPORT_WRITE_PATH /mnt/shell/emulated/0 - export BUGREPORT_READ_PATH /storage/emulated + symlink /storage/emulated_legacy /storage/sdcard0 on post-fs-data mkdir /data/media 0770 media_rw media_rw -- cgit v1.1 From e6baffc6d3df355422f7baab88cc08c99e1e7f55 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Mon, 17 Sep 2012 13:26:28 -0700 Subject: tuna: kernel prebuilt 33354dd Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 5681cf2 Merge branch 'android-3.0' into android-omap-3.0 4744c26 net: wireless: bcmdhd: Add print when power-save mode is OFF 0aa3b61 net: wireless: bcmdhd: Update wifi stack ps state if was changed 477f1d9 net: wireless: bcmdhd: Add ROAM setting per platform from Makefle BUG: b/7175460, b/7067351 Change-Id: Idaf728b90502ffdfb8ce388c9337964b6620cb5b Signed-off-by: Dmitry Shmidt --- kernel | Bin 4148268 -> 4148492 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 43fa293..9ac3038 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From a33a8e11ac5ba1ca4b3fde29704bc78434e889e9 Mon Sep 17 00:00:00 2001 From: Simon Wilson Date: Tue, 18 Sep 2012 14:32:01 -0700 Subject: audio: increase toro media speaker volume +2dB Bug: 6878923 Change-Id: Id49d6489e5a99dee088246d146ee38151ba9499c --- audio/audio_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 4206893..46b8d9b 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -261,7 +261,7 @@ #define VOICE_CALL_HEADSET_MIC_VOLUME 8 /* use-case specific output volumes */ -#define NORMAL_SPEAKER_VOLUME_TORO 4 +#define NORMAL_SPEAKER_VOLUME_TORO 6 #define NORMAL_SPEAKER_VOLUME_MAGURO 2 #define NORMAL_HEADSET_VOLUME_TORO -12 #define NORMAL_HEADSET_VOLUME_MAGURO -12 -- cgit v1.1 From 62532ce655d9f10166d9193003f4d8b21e59a227 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Thu, 20 Sep 2012 12:54:32 -0700 Subject: tuna: dhcp: Add CLIENTID request to dhcpcd service BUG: b/7175187 Change-Id: I4977a4429827ab1f996d1cefb47c094fe8cafb91 Signed-off-by: Dmitry Shmidt --- init.tuna.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.tuna.rc b/init.tuna.rc index af3c88d..94dc2fd 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -192,7 +192,7 @@ service wpa_supplicant /system/bin/wpa_supplicant \ disabled oneshot -service dhcpcd_wlan0 /system/bin/dhcpcd -aABKL +service dhcpcd_wlan0 /system/bin/dhcpcd -aABDKL class main disabled oneshot @@ -207,7 +207,7 @@ service dhcpcd_bnep0 /system/bin/dhcpcd -ABKL disabled oneshot -service dhcpcd_eth0 /system/bin/dhcpcd -ABKL +service dhcpcd_eth0 /system/bin/dhcpcd -ABDKL class main disabled oneshot -- cgit v1.1 From 16490b99c67144953bb593035528c39d0cc86843 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Thu, 20 Sep 2012 13:08:28 -0700 Subject: tuna: kernel prebuilt 0e8dcce Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 e87dc13 Merge branch 'android-3.0' into android-omap-3.0 d6a38f4 net: wireless: bcmdhd: Adjust roaming treshold to -65 dB BUG: b/7067351 Change-Id: Id3cc684d38cb97ad4723f8d0c33d0a17d41d03e5 Signed-off-by: Dmitry Shmidt --- kernel | Bin 4148492 -> 4148476 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 9ac3038..0b430d2 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 708e9e045705d9dfed744936b44bd89c145226d6 Mon Sep 17 00:00:00 2001 From: Zhihai Xu Date: Wed, 19 Sep 2012 14:07:27 -0700 Subject: ISSUE 6849488 Bluedroid stack, remove system/bluetooth. remove system/bluetooth stuff bug 6849488 Change-Id: I183359650b84e32dc210d272d42e34d0db346ac3 --- device.mk | 4 ---- init.tuna.rc | 9 --------- 2 files changed, 13 deletions(-) diff --git a/device.mk b/device.mk index 864b5dd..4889602 100644 --- a/device.mk +++ b/device.mk @@ -75,10 +75,6 @@ PRODUCT_COPY_FILES += \ device/samsung/tuna/media_codecs.xml:system/etc/media_codecs.xml \ device/samsung/tuna/gps.conf:system/etc/gps.conf -# Bluetooth configuration files -PRODUCT_COPY_FILES += \ - system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf - # Wifi ifneq ($(TARGET_PREBUILT_WIFI_MODULE),) PRODUCT_COPY_FILES += \ diff --git a/init.tuna.rc b/init.tuna.rc index 94dc2fd..6181640 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -127,15 +127,6 @@ service fRom /system/bin/fRom \ class late_start oneshot -service hciattach /system/bin/brcm_patchram_plus --enable_hci --no2bytes --enable_lpm \ - --tosleep 50000 --baudrate 3000000 --use_baudrate_for_download --i2s=1,1,0,1 \ - --patchram /vendor/firmware/bcm4330.hcd /dev/ttyO1 - class main - user bluetooth - group bluetooth net_bt_admin - disabled - oneshot - service pvrsrvctl /vendor/bin/pvrsrvctl --start --no-module class core user root -- cgit v1.1 From fd63d70c864a1196738ab081bfd063c93081e77a Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Mon, 24 Sep 2012 15:11:06 -0700 Subject: Disable scissor optimization on tuna boards Bug #7158326 Change-Id: I81bec7c0bd56fea5363de8546ab8606b6a508644 --- CleanSpec.mk | 1 + device.mk | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CleanSpec.mk b/CleanSpec.mk index 51b1305..0a024da 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -51,3 +51,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/phone_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/updatecmds/migrate_nfc.txt) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/keystore.tuna.so) +$(call add-clean-step, rm -f $(TARGET_OUT)/build.prop) diff --git a/device.mk b/device.mk index 4889602..e4d3c0d 100644 --- a/device.mk +++ b/device.mk @@ -177,6 +177,9 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.sf.lcd_density=320 +PRODUCT_PROPERTY_OVERRIDES += \ + ro.hwui.disable_scissor_opt=true + PRODUCT_CHARACTERISTICS := nosdcard PRODUCT_TAGS += dalvik.gc.type-precise -- cgit v1.1 From 09a5be4c509b6a048c34e4f2265b7139f6de72e8 Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Wed, 26 Sep 2012 17:07:13 -0700 Subject: tuna: prebuilt kernel (monotonic time overflow) 4ca3c11 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 b6f6b76 Merge branch 'android-3.0' into android-omap-3.0 e9babf3 timekeeping: fix 32-bit overflow in get_monotonic_boottime Bug: 7100774 Change-Id: Id50c89506682b2d06a8e00e20f57fc3ec1587f97 --- kernel | Bin 4148476 -> 4148468 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 0b430d2..55c7dea 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From ee72ef4556336cde5d68a44bdbc479286134d1f0 Mon Sep 17 00:00:00 2001 From: leemin Date: Mon, 24 Sep 2012 10:05:34 +0900 Subject: audio: changes ringtone volume when call is comming the ringtone offset has to be setted to analog side. Buganizer : 6920555 According to Samsung's spec, the earphone ringtone volume level should be 14dB lowere than the media playback volume. On ICS, this behavior was working properly, but on JB this behavior is not working properly. Below is the analog and digital volume change from ICS to JB: ICS : Digital Volume = Normal / Analog volume = lowered 14dB JB : Digital Volume = increased 14dB (in comparison to ICS) / Analog volume = lowered 14dB (same as ICS) Hence the volume in JB has increased by 14dB when compared to ICS. Bug 6920555. Change-Id: Ibc248612db378b5b991221468d8f801257ba4103 --- audio/audio_hw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 46b8d9b..66a6da7 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -1083,7 +1083,8 @@ static void set_output_volumes(struct tuna_audio_device *adev, bool tty_volume) speaker_volume_overrange); mixer_ctl_set_value(adev->mixer_ctls.tones_dl2_volume, 0, speaker_volume_overrange + dl2_volume_correction); - } else if (adev->mode == AUDIO_MODE_IN_COMMUNICATION) { + } else if ((adev->mode == AUDIO_MODE_IN_COMMUNICATION) || + (adev->mode == AUDIO_MODE_RINGTONE)) { mixer_ctl_set_value(adev->mixer_ctls.tones_dl1_volume, 0, MIXER_ABE_GAIN_0DB); mixer_ctl_set_value(adev->mixer_ctls.tones_dl2_volume, 0, -- cgit v1.1 From eea86dbc4b27344c51a913a80c2fc3852d44fcc8 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Sun, 30 Sep 2012 12:48:02 -0700 Subject: Final shuffle to make /sdcard work in shell. Move legacy mount location to /storage/emulated/legacy, and create a symlink to point towards shell-visible FUSE daemon. This symlink is then masked from zygote-forked apps by a tmpfs. Bug: 7255202 Change-Id: I22967c10e5719c0628816f061606924ddd15e5bb --- init.tuna.rc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/init.tuna.rc b/init.tuna.rc index 6181640..e2cae6f 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -4,18 +4,16 @@ on init # See storage config details at http://source.android.com/tech/storage/ mkdir /mnt/shell/emulated 0700 shell shell mkdir /storage/emulated 0000 root root - mkdir /storage/emulated_legacy 0000 root root - - export EXTERNAL_STORAGE /storage/emulated_legacy - export ADB_EXTERNAL_STORAGE /mnt/shell/emulated/0 + export EXTERNAL_STORAGE /storage/emulated/legacy export EMULATED_STORAGE_SOURCE /mnt/shell/emulated export EMULATED_STORAGE_TARGET /storage/emulated # Support legacy paths - symlink /storage/emulated_legacy /sdcard - symlink /storage/emulated_legacy /mnt/sdcard - symlink /storage/emulated_legacy /storage/sdcard0 + symlink /storage/emulated/legacy /sdcard + symlink /storage/emulated/legacy /mnt/sdcard + symlink /storage/emulated/legacy /storage/sdcard0 + symlink /mnt/shell/emulated/0 /storage/emulated/legacy on post-fs-data mkdir /data/media 0770 media_rw media_rw -- cgit v1.1 From 1cbde26f0976035b7cfca5cee517358047f333f6 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Sun, 30 Sep 2012 17:21:13 -0700 Subject: Allow traversal into /storage/emulated. Bug: 7255202 Change-Id: Ifc017e702f0c6b6d3ecb3220a5321303f3849c51 --- init.tuna.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.tuna.rc b/init.tuna.rc index e2cae6f..466ee7c 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -3,7 +3,7 @@ import init.tuna.usb.rc on init # See storage config details at http://source.android.com/tech/storage/ mkdir /mnt/shell/emulated 0700 shell shell - mkdir /storage/emulated 0000 root root + mkdir /storage/emulated 0555 root root export EXTERNAL_STORAGE /storage/emulated/legacy export EMULATED_STORAGE_SOURCE /mnt/shell/emulated -- cgit v1.1 From f2e62f6c54e7361c47f407527be81e5ae9f27d07 Mon Sep 17 00:00:00 2001 From: Jeff Hamilton Date: Wed, 3 Oct 2012 15:32:29 -0500 Subject: Remove the Google specific location config. Bug: 7242814 Change-Id: I2ca49b1173fcb3119301d90e0ffc5b2c81b59977 --- overlay/frameworks/base/core/res/res/values/config.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 2a08cac..2cd1c67 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -234,10 +234,6 @@ false - - com.google.android.location - - true -- cgit v1.1 From 01d531673584bf2e7eb50f0e3979915e6b6911bc Mon Sep 17 00:00:00 2001 From: Jeff Hamilton Date: Fri, 5 Oct 2012 13:01:43 -0500 Subject: Revert "Remove the Google specific location config." This reverts commit f2e62f6c54e7361c47f407527be81e5ae9f27d07. Change-Id: I575b57b5e8399190320795863ae2549dac3c1682 --- overlay/frameworks/base/core/res/res/values/config.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 2cd1c67..2a08cac 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -234,6 +234,10 @@ false + + com.google.android.location + + true -- cgit v1.1 From 2bb0b01cbad57ca1d52272b469435eb7494fd0e5 Mon Sep 17 00:00:00 2001 From: Jeff Hamilton Date: Fri, 5 Oct 2012 13:01:43 -0500 Subject: Revert "Remove the Google specific location config." This reverts commit f2e62f6c54e7361c47f407527be81e5ae9f27d07. Change-Id: I575b57b5e8399190320795863ae2549dac3c1682 --- overlay/frameworks/base/core/res/res/values/config.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 2cd1c67..2a08cac 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -234,6 +234,10 @@ false + + com.google.android.location + + true -- cgit v1.1 From c3ed9c3339c9c3f75212b1472bbf71af568e0c0f Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Tue, 16 Oct 2012 11:48:13 -0700 Subject: Report feature "android.hardware.audio.low_latency" Bug: 4554178 Change-Id: Ic5695e6dca43fb1b608bf35b26bb7730294ae612 --- device.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index e4d3c0d..8ba2144 100644 --- a/device.mk +++ b/device.mk @@ -137,7 +137,8 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \ frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \ frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \ - frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml + frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \ + frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml # Melfas touchscreen firmware PRODUCT_COPY_FILES += \ -- cgit v1.1 From 57418d64328a9da5d9bde3011653643de2d08c92 Mon Sep 17 00:00:00 2001 From: Jeff Hamilton Date: Tue, 16 Oct 2012 08:44:35 -0500 Subject: Remove the Google specific location config. This reverts commit 01d531673584bf2e7eb50f0e3979915e6b6911bc. Bug: 7242814 Change-Id: I8cf6180b42a71d15b461776250acd67a68e36b90 --- overlay/frameworks/base/core/res/res/values/config.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 2a08cac..2cd1c67 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -234,10 +234,6 @@ false - - com.google.android.location - - true -- cgit v1.1 From 405ef82cfe87aaf0fc39f09b481176a9c605c93c Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Wed, 24 Oct 2012 17:12:39 -0700 Subject: tuna: kernel prebuilt 8c3171c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 9ea9dec Merge branch 'android-3.0' into android-omap-3.0 834029a net: wireless: bcmdhd: Fix WD wakelock behavior c305cc6 net: wireless: bcmdhd: Fix BSSID report for disassoc Bug: 7400943 Change-Id: I292c6e3c71371659157880460628b81cecbef98d Signed-off-by: Dmitry Shmidt --- kernel | Bin 4148468 -> 4150888 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 55c7dea..0f4dbc9 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1 From 214d003a47e7fe2962df667c5d65bce92a21a40e Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Fri, 2 Nov 2012 11:20:49 -0700 Subject: tuna: prebuilt kernel (wifi wakelock revert, uname security fix) d5a18e0 Revert "net: wireless: bcmdhd: Fix WD wakelock behavior" 0eaeacc use clamp_t in UNAME26 fix 4c15176 kernel/sys.c: fix stack memory content leak via UNAME26 Bug: 7459403, 7448654 Change-Id: I166daa13cfef2fec17385bac71d768a2726c7e59 --- kernel | Bin 4150888 -> 4150860 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kernel b/kernel index 0f4dbc9..ceec44e 100644 Binary files a/kernel and b/kernel differ -- cgit v1.1