summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-270-0/+0
|\
| * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-250-0/+0
| |\
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-210-0/+0
| | |\
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-200-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-180-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-130-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-120-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-110-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-090-0/+0
| | | | | | | | |\
| | | | | | | | | * Bring back ADB_EXTERNAL_STORAGE.Jeff Sharkey2012-09-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7119408 Change-Id: Ia08146965ee6218a033a70c2f02cbc621e339316
| | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-060-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-030-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-290-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-230-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-210-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-200-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * tuna: prebuilt kernel (HSMMC1 suspend fix)Todd Poynor2012-08-151-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-150-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-140-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * tuna: prebuilt kernel (BT power, DDK revert, gadget fix)Todd Poynor2012-08-131-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-130-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * Revert "prebuilt kernel (DDK 1.9RC1, usb gadget,...)"JP Abgrall2012-08-081-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a424e789f4790778bdd962bd2a032f64050eba89. Bug: 6951799
* | | | | | | | | | | | | | | | | | | | tuna: prebuilt kernel (monotonic time overflow)Todd Poynor2012-09-261-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
* | | | | | | | | | | | | | | | | | | Disable scissor optimization on tuna boardsRomain Guy2012-09-242-0/+4
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #7158326 Change-Id: I81bec7c0bd56fea5363de8546ab8606b6a508644
* | | | | | | | | | | | | | | | | | ISSUE 6849488 Bluedroid stack, remove system/bluetooth.Zhihai Xu2012-09-202-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove system/bluetooth stuff bug 6849488 Change-Id: I183359650b84e32dc210d272d42e34d0db346ac3
* | | | | | | | | | | | | | | | | | tuna: kernel prebuiltDmitry Shmidt2012-09-201-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>
* | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | | | | | | | | audio: increase toro media speaker volume +2dBSimon Wilson2012-09-181-1/+1
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6878923 Change-Id: Id49d6489e5a99dee088246d146ee38151ba9499c
* | | | | | | | | | | | | | | | tuna: kernel prebuiltDmitry Shmidt2012-09-171-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 'e17785c8aa99a7ea716e2df4d334e3ebb2f25260': 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-101-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 '2f4ab3b1e14f4075dcf1c2d784f5fd4d753f0d81': rename torospr to toroplus
| * | | | | | | | | | | | | | | am 5bc53d51: rename torospr to toroplusMadan Ankapura2012-09-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5bc53d51b5594b748880b3c5b12cd9ac635b2c8b': 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-111-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 'bd9be9e9f52956b759b5d7fc76da68d03a7e0825': tuna: Kernel prebuilt
| * | | | | | | | | | | | | | am adca85d2: tuna: Kernel prebuiltDmitry Shmidt2012-09-101-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'adca85d21828c33c277f1e27e1f31a5d8a2d30e9': tuna: Kernel prebuilt
| | * | | | | | | | | | | | | tuna: Kernel prebuiltDmitry Shmidt2012-09-101-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-071-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | tuna: Kernel prebuiltDmitry Shmidt2012-09-071-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>
generated by cgit v1.1 at 2024-06-20 16:46:34 +0000