summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | update nfc pathRamanan Rajeswaran2012-04-121-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: I9dfdcde13ba5a5b33cb3b703232783e12a56a1f7
* | | | kernel prebuild update (wifi, wimax, ...)JP Abgrall2012-04-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e47bcec Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip-mergedown eb14bbb net: wireless: bcmdhd: Fix improper band handling 28457bf net: wimax: Padding problem fix. e04e953 cpufreq: interactive: don't drop speed if recently at higher load 1c41e01 cpufreq: interactive: set at least hispeed when above hispeed load e661e9b cpufreq: interactive: apply intermediate load to max speed not current f69e75f net: wimax: driver panic because of mmc debug log 8723a0d net: wimax: fix system process not responding ANR. c78af49 net: wireless: bcmdhd: Update to version 5.90.195.53 ce0fa42 Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip-mergedown beb914e xt_IDLETIMER: Add new netlink msg type for IDLETIMER. 4991496 switch: add timestamps to switch driver Change-Id: I369107c9dc3666f537ac3c490f7fb9a3833550bb
* | | | Remove unused NTP_SERVER.Jeff Sharkey2012-04-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Platform now uses Settings.Secure.NTP_SERVER. Change-Id: Icd6031d8f1af9bf8a3ba4ffa3ef1b9f40fc7d656
* | | | Merge "Organize external storage to enforce sdcard_r."Jeff Sharkey2012-04-103-5/+7
|\ \ \ \
| * | | | Organize external storage to enforce sdcard_r.Jeff Sharkey2012-04-103-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create /storage/ to require that users have sdcard_r GID, and place both emulated and real SD card mount points inside it. Also reduce visibility of /data/media. Bug: 6131916 Change-Id: I088218e7df131dc206356f33174abc0702d9b271
* | | | | libcamera: remove unused fimc_v4l2_s_ext_ctrl functionDima Zavin2012-04-091-20/+0
|/ / / / | | | | | | | | | | | | | | | | Change-Id: I393a30310e2768931be7468f5f6f506d1658d655 Signed-off-by: Dima Zavin <dima@android.com>
* | | | kernel prebuild (gpu: enable MMU pagetable write-protection)JP Abgrall2012-04-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | 567391a gpu: pvr: Re-enable MMU pagetable write-protection Change-Id: Ic2a13e6cb8c9a6e5c9f3f0fdd22207b25e720e0a
* | | | kernel perbuild update (DDK 1.8@869593)JP Abgrall2012-04-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | 4e88a14 gpu: pvr: Update to DDK 1.8@869593 Change-Id: I569efbe191eb076f700b87502c2929845895143f
* | | | Merge "audio policy: added configuration file"Eric Laurent2012-04-033-4/+55
|\ \ \ \
| * | | | audio policy: added configuration fileEric Laurent2012-03-213-4/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added audio policy manager configuration file. removed obsolete hasBackMicrophone() method from AudioPolicyManagerBase class. Change-Id: Ib5e5f8b5af9bb0b53a6c0c4f45be374bb8863c92
* | | | | kernel prebuild update (enable XFRM for userland)JP Abgrall2012-04-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c2b15c configs: herring: enable XFRM_USER Change-Id: I045ebb65c9f81032359ac9859583bee0806a35f1
* | | | | kernel prebuild update (mostly wifi and fimc fixes)JP Abgrall2012-04-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93aaa50 Merge branch 'android-3.0' into android-samsung-3.0-wip 1dd49da net: wireless: bcmdhd: Move FW hang processign to work queue b071e43 net: wireless: bcmdhd: Fix FW hang recovery 7d6c28c net: wireless: bcmdhd: Fix frame sequence lag issue 610939f USB: gadget: s3c: iscochronous endpoint support 3a5c070 S5PC11X: FIMC: Modify to run fimc after all configurations 25f0a76 S5PC11X: FIMC: Call sw reset when stopping fimc 90a2fbc S5PC11X: PD: Restore clock status in error case of enabling power domain d916b9f S5PC11X: FIMC: Handle off mode in suspend()/resume() Change-Id: I30097f25a27d8ccb19739c615ca92f428486a627
* | | | | am f7a97cca: am 30a4fe17: Generate sojua and sojuk factory images in ↵Jean-Baptiste Queru2012-04-021-86/+18
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | addition to soju * commit 'f7a97cca1d254f80e35e0ac6083e62da8d79a98a': Generate sojua and sojuk factory images in addition to soju
| * | | | am 30a4fe17: Generate sojua and sojuk factory images in addition to sojuJean-Baptiste Queru2012-04-021-86/+18
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '30a4fe172ec64250f77bb59621c97d10b0495f0b': Generate sojua and sojuk factory images in addition to soju
| | * | | Generate sojua and sojuk factory images in addition to sojuJean-Baptiste Queru2012-04-021-86/+18
| | | |/ | | |/| | | | | | | | | Change-Id: I044d9cb7c749aee4ec6d665cfd884a30e404f24c
* | | | crespo: kernel prebuiltDmitry Shmidt2012-03-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 937fb8b Merge branch 'android-3.0' into android-samsung-3.0-wip f764be6 net: wireless: bcmdhd: Fix crash in dhd_preinit_ioctls() band set 54ba9e6 net: wireless: bcmdhd: Add CONFIG_DHD_ENABLE_P2P Kconfig option 7067adf misc: fsa9480: disable/enable irq on suspend/resume Change-Id: I37a746609608e1d19a196b9195d4fa19bae1e342 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | kernel prebuild update (disable oprofile, enable perf)JP Abgrall2012-03-281-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | 4c9f380 herring_defconfig: enable perf events and disable oprofile. Change-Id: I66874716dce0ab4d456c72a0aa6088c52826ba22
* | | | crespo: Kernel prebuiltDmitry Shmidt2012-03-281-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07b11d3 Merge branch 'android-3.0' into android-samsung-3.0-wip 5255043 net: wireless: bcmdhd: Turn off DHD_USE_EARLYSUSPEND option 8c94e79 net: wireless: bcmdhd: Update to Version 5.90.195.46 7f38646 net: wireless: bcmdhd: Add 'wlan_ctrl_wake' wakelock dfe6f6f usb: gadget: s3c: Enable some debugging via pr_debug()+DYNAMIC_DEBUG Change-Id: I38d899c5c2f1c205f3b9801458f1e50707194d6c Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | am 2a544301: am 5cd7e86d: organize scripts with per-version sections to ↵Jean-Baptiste Queru2012-03-281-2/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | avoid merge conflicts * commit '2a544301a2454b7c5a18e8028430a6b13ded0d89': organize scripts with per-version sections to avoid merge conflicts
| * | | am 5cd7e86d: organize scripts with per-version sections to avoid merge conflictsJean-Baptiste Queru2012-03-281-2/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '5cd7e86dd019c146d1e9671cb2e9efd9fc009400': organize scripts with per-version sections to avoid merge conflicts
| | * | organize scripts with per-version sections to avoid merge conflictsJean-Baptiste Queru2012-03-281-2/+7
| | | | | | | | | | | | | | | | Change-Id: Ieb452fa5e3a04cdab475beb69a558ba0591713e1
* | | | am 984102fa: am 308dbe9e: Distributables for IMM76DJean-Baptiste Queru2012-03-283-4/+121
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '984102fa1d7053b82ecf1384eb5a6653cc98e366': Distributables for IMM76D
| * | | am 308dbe9e: Distributables for IMM76DJean-Baptiste Queru2012-03-283-4/+121
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '308dbe9ef5bee9635cf3e73469ffd7556ea9e2e9': Distributables for IMM76D
| | * | Distributables for IMM76DJean-Baptiste Queru2012-03-273-4/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update script for self-extractors of proprietary binaries. Also add script to package factory images. Remove references to obsolete bootloaders/radios that nobody will need to have any more. Change-Id: Ib3150eae2bd2b8cdb0fde61fe912dceb35c85f64
* | | | move hardware feature definitionsColin Cross2012-03-262-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the hardware feature xml files from frameworks/base/data/etc to frameworks/native/data/etc. Change-Id: I2ab863710024d1482756223cae712495029bbd6a
* | | | Merge "crespo: prebuilt kernel"Benoit Goby2012-03-231-0/+0
|\ \ \ \
| * | | | crespo: prebuilt kernelBenoit Goby2012-03-231-0/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 25aa939 Merge branch 'android-3.0' into android-samsung-3.0-wip d993be5 android: logger: Allow a UID to read it's own log entries 17ce6ff usb: gadget: adb: Only enable the gadget when adbd is ready Change-Id: I99af936ddcac6601bb1c36e8d2c639fa36d0b732
* | | | crespo: update dalvik heap config locationDima Zavin2012-03-231-1/+1
|/ / / | | | | | | | | | | | | Change-Id: I43ad0533264d59229fb0dcdee4073d87e0a4143f Signed-off-by: Dima Zavin <dima@android.com>
* | | Merge "Merge remote-tracking branch 'goog/ics-aah-exp'"Mike Lockwood2012-03-210-0/+0
|\ \ \
| * \ \ Merge remote-tracking branch 'goog/ics-aah-exp'Mike Lockwood2012-03-210-0/+0
| |\ \ \
| | * \ \ am 1232ac72: new kernel + wifi prebuiltSimon Wilson2012-02-032-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '1232ac72d0d66b35997fd06e402a9daa9147cbaa': new kernel + wifi prebuilt
| | * \ \ \ am 01a09267: crespo: prebuilt kernel + wifiTodd Poynor2012-01-252-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '01a09267de5bc2ecad5ee6c76a3634f5d0a1a11d': crespo: prebuilt kernel + wifi
| | * \ \ \ \ am 89d5ad7c: Merge "S5PC11X : RIL : Chage radio directory create sequence ↵Wink Saville2012-01-201-2/+4
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Issue 5858560)" into ics-mr1 * commit '89d5ad7c0c30e61315d2e0a0be3ae3903d6e366c': S5PC11X : RIL : Chage radio directory create sequence (Issue 5858560)
| | * \ \ \ \ \ am 29ee8759: Merge "Update media_profiles_korea.xml so that it recognizes ↵Justin Ho2012-01-201-13/+111
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolution-based profile settings" into ics-mr1 * commit '29ee8759bb8fb3df62d721c91ea3003ce1303a14': Update media_profiles_korea.xml so that it recognizes resolution-based profile settings
| | * \ \ \ \ \ \ am d2bdbb63: kernel + wifi prebuild update (/proc/pid/mem)JP Abgrall2012-01-202-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd2bdbb63bd45a0b1defdae9f0c1292a317eaa18c': kernel + wifi prebuild update (/proc/pid/mem)
| | * \ \ \ \ \ \ \ am 855e9657: new kernel + wifi prebuiltSimon Wilson2012-01-182-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '855e9657e00ee7a8e687ff73f87fef37c9f5d2a1': new kernel + wifi prebuilt
| | * \ \ \ \ \ \ \ \ am 4fb4a982: new kernel + wifi prebuiltSimon Wilson2012-01-132-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4fb4a98266215f685fc987661a9b4040f1a97b20': new kernel + wifi prebuilt
| | * \ \ \ \ \ \ \ \ \ am 7b6d8e7b: kernel + wifi prebuild updateJP Abgrall2012-01-122-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b6d8e7b6d7099ef46fa9cd34df3e619120fe3dd': kernel + wifi prebuild update
| | * \ \ \ \ \ \ \ \ \ \ am 9287e838: Merge "Add support for radio.I9020AUCKJ1" into ics-mr1Wink Saville2012-01-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9287e838288d7f1434542a880b3e7e753aa831be': Add support for radio.I9020AUCKJ1
| | * \ \ \ \ \ \ \ \ \ \ \ am 3a123582: Kernel and wlan driver prebuiltDmitry Shmidt2012-01-042-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a123582c9d4b704817bb7c9b04782e78904b9d9': Kernel and wlan driver prebuilt
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 786e339b: Revert "Fix ANR in com.google.android.videoeditor"Jamie Gennis2011-12-152-4/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '786e339b94e234a991606b9e905fe9fda398774e': Revert "Fix ANR in com.google.android.videoeditor"
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am b96e3ec4: new kernel prebuilt + wifiBenoit Goby2011-12-132-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b96e3ec4427df661c4c42d4dab1cfe819637a3cd': new kernel prebuilt + wifi
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c2dc28f3: S5PC11X : Radio : Add /data/radio directory for nv_data.binJeonghwan Min2011-12-091-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c2dc28f38ca01d1f2abd35826a89040512c5d849': S5PC11X : Radio : Add /data/radio directory for nv_data.bin
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ec5cb294: Update board-info to use KL1 BootloaderMaarten Hooft2011-12-091-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec5cb2941e7b0d1901fd2bb688398ccdf1c917cf': Update board-info to use KL1 Bootloader
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c83c5db4: new kernel prebuilt + wifiSimon Wilson2011-12-092-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c83c5db4cff9fb87db991030f1e1781cbaa822f1': new kernel prebuilt + wifi
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 779a3509: kernel + wifi prebuild update (gpu DDK 1.8@785978)JP Abgrall2011-12-082-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '779a350942251a8b7cc1ec70a4baccaab6374ea6': kernel + wifi prebuild update (gpu DDK 1.8@785978)
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b9e18606: Fix SEC-OMX Video Encode for get out encode last frame.SeungBeom Kim2011-12-073-2/+56
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b9e186067caad92c3f50c4abe87b55965a88ea6f': Fix SEC-OMX Video Encode for get out encode last frame.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e13c61aa: Merge "Removing wallpaper overlays for crespo (Bug 5506089)" ↵Winson Chung2011-12-0719-36/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'e13c61aaca8da78ab2e9460d3d03bdbff0e46fc4': Removing wallpaper overlays for crespo (Bug 5506089)
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 15421720: Crespo prebuilt kernel/wlanPaul Eastham2011-12-072-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '154217204ee6f7c7f54a7c1a388e8f3ece29cf97': Crespo prebuilt kernel/wlan
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d2e6827b: Merge "Removing old wallpaper from mk file (Bug 5279959)" into ↵Winson Chung2011-12-051-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'd2e6827bf870eff38ba274825d0c1cc8ef25b804': Removing old wallpaper from mk file (Bug 5279959)