summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 405ef82c: tuna: kernel prebuiltDmitry Shmidt2012-10-240-0/+0
|\ | | | | | | | | * commit '534009a3db09ef220646cfb21fe4aabc274260e3': tuna: kernel prebuilt
| * tuna: kernel prebuiltDmitry Shmidt2012-10-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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 <dimitrysh@google.com>
* | am 1973c025: Merge "Report feature "android.hardware.audio.low_latency"" ↵Glenn Kasten2012-10-181-1/+2
|\ \ | |/ | | | | | | | | | | into jb-mr1-dev * commit 'c44d3a90c0c3d89f964bfd59a5ffd933f65ad7fb': Report feature "android.hardware.audio.low_latency"
| * Merge "Report feature "android.hardware.audio.low_latency"" into jb-mr1-devGlenn Kasten2012-10-181-1/+2
| |\
| | * Report feature "android.hardware.audio.low_latency"Glenn Kasten2012-10-161-1/+2
| | | | | | | | | | | | | | | Bug: 4554178 Change-Id: Ic5695e6dca43fb1b608bf35b26bb7730294ae612
* | | am 57418d64: Remove the Google specific location config.Jeff Hamilton2012-10-181-4/+0
|\ \ \ | |/ / | | | | | | | | | * commit '491950ddb2fe9c14c8ee3be06f1e654556fa2dd8': Remove the Google specific location config.
| * | Remove the Google specific location config.Jeff Hamilton2012-10-161-4/+0
| |/ | | | | | | | | | | | | This reverts commit f7d299d080521a796cc60ef0d03ebb913c3a0a36. Bug: 7242814 Change-Id: I8cf6180b42a71d15b461776250acd67a68e36b90
* | am 01d53167: Revert "Remove the Google specific location config."Jeff Hamilton2012-10-051-0/+4
|\ \ | |/ | | | | | | * commit 'f7d299d080521a796cc60ef0d03ebb913c3a0a36': Revert "Remove the Google specific location config."
| * Revert "Remove the Google specific location config."Jeff Hamilton2012-10-051-0/+4
| | | | | | | | | | | | This reverts commit 8d1a08383fb9dee994120f63f92118fd5b4d1931. Change-Id: I575b57b5e8399190320795863ae2549dac3c1682
* | am f2e62f6c: Remove the Google specific location config.Jeff Hamilton2012-10-041-4/+0
|\ \ | |/ | | | | | | * commit '8d1a08383fb9dee994120f63f92118fd5b4d1931': Remove the Google specific location config.
| * Remove the Google specific location config.Jeff Hamilton2012-10-031-4/+0
| | | | | | | | | | Bug: 7242814 Change-Id: I2ca49b1173fcb3119301d90e0ffc5b2c81b59977
* | am 1cbde26f: Allow traversal into /storage/emulated.Jeff Sharkey2012-09-301-1/+1
|\ \ | |/ | | | | | | * commit 'c6a138773dc816183f0badc86d24340058e1e16e': Allow traversal into /storage/emulated.
| * Allow traversal into /storage/emulated.Jeff Sharkey2012-09-301-1/+1
| | | | | | | | | | Bug: 7255202 Change-Id: Ifc017e702f0c6b6d3ecb3220a5321303f3849c51
* | am eea86dbc: Final shuffle to make /sdcard work in shell.Jeff Sharkey2012-09-301-7/+5
|\ \ | |/ | | | | | | * commit 'd07cd4f23e96cde0af1f125a833ac20206860ea4': Final shuffle to make /sdcard work in shell.
| * Final shuffle to make /sdcard work in shell.Jeff Sharkey2012-09-301-7/+5
| | | | | | | | | | | | | | | | | | 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
* | am ee72ef45: audio: changes ringtone volume when call is commingleemin2012-09-271-1/+2
|\ \ | |/ | | | | | | * commit '6aa160e32251b3b04a28b4c2bdf42daf979e2e55': audio: changes ringtone volume when call is comming
| * audio: changes ringtone volume when call is commingleemin2012-09-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 09a5be4c: tuna: prebuilt kernel (monotonic time overflow)Todd Poynor2012-09-260-0/+0
|\ \ | |/ | | | | | | * commit 'd9829aa0512efb1868fe6ca638f70e379d18b3dc': tuna: prebuilt kernel (monotonic time overflow)
| * tuna: prebuilt kernel (monotonic time overflow)Todd Poynor2012-09-260-0/+0
| | | | | | | | | | | | | | | | | | 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
* | am fd63d70c: Disable scissor optimization on tuna boards Bug #7158326Romain Guy2012-09-242-0/+4
|\ \ | |/ | | | | | | * commit 'd7df0a159bb7177c6571d43749b36d26a2258b74': Disable scissor optimization on tuna boards Bug #7158326
| * Disable scissor optimization on tuna boardsRomain Guy2012-09-242-0/+4
| | | | | | | | | | | | Bug #7158326 Change-Id: I81bec7c0bd56fea5363de8546ab8606b6a508644
* | am 708e9e04: ISSUE 6849488 Bluedroid stack, remove system/bluetooth.Zhihai Xu2012-09-212-13/+0
|\ \ | |/ | | | | | | * commit 'f79109f3f9e04a71ffebdb1c311b71faef1ca9d6': ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
| * ISSUE 6849488 Bluedroid stack, remove system/bluetooth.Zhihai Xu2012-09-202-13/+0
| | | | | | | | | | | | | | | | remove system/bluetooth stuff bug 6849488 Change-Id: I183359650b84e32dc210d272d42e34d0db346ac3
* | am 16490b99: tuna: kernel prebuiltDmitry Shmidt2012-09-210-0/+0
|\ \ | |/ | | | | | | * commit '0f19d1869052958a3945e638f24f8d10b3584670': tuna: kernel prebuilt
| * tuna: kernel prebuiltDmitry Shmidt2012-09-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | 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 <dimitrysh@google.com>
* | am 62532ce6: tuna: dhcp: Add CLIENTID request to dhcpcd serviceDmitry Shmidt2012-09-211-2/+2
|\ \ | |/ | | | | | | * commit 'b93b7ba06b16454bbfc1ba07b6b3fae753fa504f': tuna: dhcp: Add CLIENTID request to dhcpcd service
| * tuna: dhcp: Add CLIENTID request to dhcpcd serviceDmitry Shmidt2012-09-201-2/+2
| | | | | | | | | | | | | | BUG: b/7175187 Change-Id: I4977a4429827ab1f996d1cefb47c094fe8cafb91 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | am a33a8e11: audio: increase toro media speaker volume +2dBSimon Wilson2012-09-201-1/+1
|\ \ | |/ | | | | | | * commit '5e551279c017e57fdf66f89e10e6b81dbe301922': audio: increase toro media speaker volume +2dB
| * audio: increase toro media speaker volume +2dBSimon Wilson2012-09-181-1/+1
| | | | | | | | | | Bug: 6878923 Change-Id: Id49d6489e5a99dee088246d146ee38151ba9499c
* | am e6baffc6: tuna: kernel prebuiltDmitry Shmidt2012-09-170-0/+0
|\ \ | |/ | | | | | | * commit 'fb78ea2a618f202789bdc83d71c5d69e2c10174b': tuna: kernel prebuilt
| * 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>
* | am 7f410656: Merge "One more legacy symlink." into jb-mr1-devJeff Sharkey2012-09-131-4/+1
|\ \ | |/ | | | | | | * commit '61cdc30393789d83f9ba73c0f796f6d4d4eec100': One more legacy symlink.
| * 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 7d69ab8b: (-s ours) am e17785c8: (-s ours) Reconcile with jb-mr0-release ↵The Android Open Source Project2012-09-120-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | - do not merge * commit 'cbba0344d9aadff44b5e7545ac3bbcdb86b445f8': tuna: Kernel prebuilt
| * | 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 7cae4712: am 2f4ab3b1: am 5bc53d51: rename torospr to toroplusMadan Ankapura2012-09-120-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd94e677ed889ffd3de89ec02921f2010cd63fe34': rename torospr to toroplus
| * | | | 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>
* | | | | am 260f6e0a: Include user identifier in external storage paths.Jeff Sharkey2012-09-112-29/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0d06d9429fdf9758510069d9d11ba0d9edafa7f5': Include user identifier in external storage paths.
| * | | | 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
* | | | | am 24ad06f4: Merge "No multiuser settings for phones" into jb-mr1-devAmith Yamasani2012-09-111-2/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0fd66f5f7463e6be7a8883bcfa578f842bbee875': No multiuser settings for phones
| * | | | 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
* | | | | | am c7f6720e: tuna: Update kernel prebuiltDima Zavin2012-09-110-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'de25e1b227f986781273c84e7c78f461a36a7239': tuna: Update kernel prebuilt
| * | | | | 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>
* | | | | am ae2494f6: Merge "audio: add device specific audio_effects.conf file" into ↵Eric Laurent2012-09-102-2/+135
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'b2bf685a545b7492f86afe6df5df2daf9be15d7a': audio: add device specific audio_effects.conf file