summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* audio: increase toro media speaker volume +2dBSimon Wilson2012-09-181-1/+1
| | | | | Bug: 6878923 Change-Id: Id49d6489e5a99dee088246d146ee38151ba9499c
* tuna: kernel prebuiltDmitry Shmidt2012-09-170-0/+0
| | | | | | | | | | | | | 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 <dimitrysh@google.com>
* Merge "One more legacy symlink." into jb-mr1-devJeff Sharkey2012-09-131-4/+1
|\
| * One more legacy symlink.Jeff Sharkey2012-09-131-4/+1
| | | | | | | | Change-Id: If598bb76fc760c7f12dcf9a5ff865508106e73d0
* | am e17785c8: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-120-0/+0
|\ \ | | | | | | | | | | | | * commit '73da42032349c22b183bb46e5d7e708d27ca983c': tuna: Kernel prebuilt
| * \ Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-120-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: Ieda80a0e02948eae77ef3dc271aac8bc3111fee8
| | * | tuna: Kernel prebuiltDmitry Shmidt2012-09-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f6d371 net: wireless: bcmdhd: Report proper mcs rate mask BUG: b/7103180 Change-Id: Icd315e735cc7ca3e6519af6a216c718280ced292 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | am 2f4ab3b1: am 5bc53d51: rename torospr to toroplusMadan Ankapura2012-09-120-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit 'bda1a23da69be74593a08ce58100ce54965428f7': rename torospr to toroplus
| * | am 5bc53d51: rename torospr to toroplusMadan Ankapura2012-09-120-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit 'fc9d6608d250b7767fcba5376da8d112cd12c006': rename torospr to toroplus
| | * | rename torospr to toroplusMadan Ankapura2012-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6940653 Change-Id: I4cf7cc5a9f4acdc53f1d1ec13c586faf448d6645 Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
* | | | Include user identifier in external storage paths.Jeff Sharkey2012-09-112-29/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building external storage paths, always include user in path to enable cross-user paths and aid debugging. Bug: 7131382 Change-Id: Ic065fb8739a9d5d6e7f88ab93932391d906fed57
* | | | Merge "No multiuser settings for phones" into jb-mr1-devAmith Yamasani2012-09-111-2/+0
|\ \ \ \
| * | | | No multiuser settings for phonesAmith Yamasani2012-09-111-2/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I22300346f05d066db65e43cdd699f5dbc910b515
* | | | | tuna: Update kernel prebuiltDima Zavin2012-09-110-0/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <dima@android.com>
* | | | Merge "audio: add device specific audio_effects.conf file" into jb-mr1-devEric Laurent2012-09-102-2/+135
|\ \ \ \
| * | | | audio: add device specific audio_effects.conf fileEric Laurent2012-09-072-2/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am bd9be9e9: (-s ours) am adca85d2: tuna: Kernel prebuiltDmitry Shmidt2012-09-100-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit 'ae1a62cd8d4c2b5cd84ce63298c31db7f2bc2b2f': tuna: Kernel prebuilt
| * | | am adca85d2: tuna: Kernel prebuiltDmitry Shmidt2012-09-100-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '19e1881fb3eeffb43f472a6b8f4f008f2d14c986': tuna: Kernel prebuilt
| | * | tuna: Kernel prebuiltDmitry Shmidt2012-09-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f6d371 net: wireless: bcmdhd: Report proper mcs rate mask BUG: b/7103180 Change-Id: Icd315e735cc7ca3e6519af6a216c718280ced292 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | audio: fix string leakage in out_get_parameters()Eric Laurent2012-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "tuna: Kernel prebuilt" into jb-mr1-devDmitry Shmidt2012-09-070-0/+0
|\ \ \ \
| * | | | tuna: Kernel prebuiltDmitry Shmidt2012-09-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <dimitrysh@google.com>
* | | | | audio: changes for new audio device enumsEric Laurent2012-09-061-69/+43
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-devJeff Sharkey2012-09-061-0/+1
|\ \ \ \
| * | | | Bring back ADB_EXTERNAL_STORAGE.Jeff Sharkey2012-09-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7119408 Change-Id: Ia08146965ee6218a033a70c2f02cbc621e339316
* | | | | am 560e7fdf: (-s ours) Reconcile with jb-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / * commit '7936b6ad75ae55c9b470fadd530c9c483d187fb8':
| * | | Reconcile with jb-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I9328881b4ad7f1616c24abc040a9d7e702829a23
| | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-08-290-0/+0
| | |\ \ \
| | | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-08-290-0/+0
| | | |\ \ \ | | | |/ / / | | |/| | |
* | | | | | Remove /sdcard hack for shell users.Jeff Sharkey2012-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "make_ext4fs has moved to build/target/core.mk" into jb-mr1-devKenny Root2012-08-301-1/+0
|\ \ \ \ \ \
| * | | | | | make_ext4fs has moved to build/target/core.mkKenny Root2012-08-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | audio: fix echo reference channels configurationEric Laurent2012-08-301-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | tuna: prebuilt kernel (netfilter, wifi)Todd Poynor2012-08-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | tuna: kernel prebuiltDmitry Shmidt2012-08-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <dimitrysh@google.com>
* | | | | | Use 3 ms buffers for low latency pathGlenn Kasten2012-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icf113e2e863a79cb3d870fac5781539702cdbfa8
* | | | | | Merge "Triple buffer if SRC enabled" into jb-mr1-devGlenn Kasten2012-08-271-0/+7
|\ \ \ \ \ \
| * | | | | | Triple buffer if SRC enabledGlenn Kasten2012-08-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6881638 Change-Id: I76255c2cd5845671c2342e22932c692342257208
* | | | | | | Iteration on multi-user external storage.Jeff Sharkey2012-08-221-5/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symlink to make /sdcard work for shell users. Environment variable to find root of multiuser SD card. Bug: 6925012 Change-Id: Ia190a609a3b04357a7acb8fe630971bb13aab249
* | | | | | Merge "Add support for per device bluetooth configuration." into jb-mr1-devWink Saville2012-08-202-1/+26
|\ \ \ \ \ \
| * | | | | | Add support for per device bluetooth configuration.Wink Saville2012-08-202-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6837125 Change-Id: I3c05e57703c02bb9981bd4628347cc7e3b060574
* | | | | | | tuna: prebuilt kernel (shutdown hang)Todd Poynor2012-08-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Revert "Add bthid device driver ko file. Init it as device driver node."Matthew Xie2012-08-203-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UHID device in kernel is used instead of this driver. This reverts commit 7607421ba7b5f17556316b801caaf16dfa028bb3.
* | | | | | | Merge "Migrate sdcard0 to shell-accessible location." into jb-mr1-devJeff Sharkey2012-08-201-3/+7
|\ \ \ \ \ \ \
| * | | | | | | Migrate sdcard0 to shell-accessible location.Jeff Sharkey2012-08-201-3/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7005701 Change-Id: I0c07505d9ccc2842186a00a4e96489063cc8c7e8
* | | | | | | Merge "tuna: prebuilt kernel" into jb-mr1-devBenoit Goby2012-08-200-0/+0
|\ \ \ \ \ \ \
| * | | | | | | tuna: prebuilt kernelBenoit Goby2012-08-200-0/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Remove android.software.live_wallpaper.xml from PRODUCT_COPY_FILESYing Wang2012-08-201-3/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7019907 Change-Id: I5248e0b0522bc688e4f77a59672590ba298de3e5
* | | | | | am ef53876e: (-s ours) Reconcile with jb-mr0-release jb-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '7b46d053a1d16a30a753f297b41699ff7fc82659': tuna: prebuilt kernel (HSMMC1 suspend fix)
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Reconcile with jb-mr0-release jb-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | | Change-Id: I0a4cbc45069630a6cfee2647e58fbdeee4f37a94