summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-12-05Merge commit '6922f90b4a983c65a6154cd76766841be3be89fb' into HEADtest-tempidea133The Android Open Source Project
2013-12-05Merge "Push wpa_supplicant modules down to the leaf product config."Ying Wang
2013-12-05Push wpa_supplicant modules down to the leaf product config.Ying Wang
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in external/wpa_supplicant_8 we don't need those modules if WPA_SUPPLICANT_VERSION is not set by the BoardConfig.mk. Change-Id: I94193f8a0e772f86912eeb209f4a6359159c5cc1
2013-11-27Merge "Label charge_enabled and permit healthd to access it."Nick Kralevich
2013-11-27Label charge_enabled and permit healthd to access it.Stephen Smalley
Resolves: type=1400 audit(1385528301.505:5): avc: denied { write } for pid=114 comm="healthd" name="charge_enabled" dev="sysfs" ino=12333 scontext=u:r:healthd:s0 tcontext=u:object_r:sysfs:s0 tclass=file Change-Id: Ib3e56520f0057b9c45a009db2ba0d455f72561c3 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-11-26Merge "Address 4.4 denials."Nick Kralevich
2013-11-26Address 4.4 denials.Robert Craig
Change-Id: Ic05e3262c3905a92cb91448e14a4a5e0905d0303 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-11-22Merge commit 'c54c4c3c9aae0fd888d1efe72a397187ee6dcd0d' into HEADThe Android Open Source Project
2013-11-15am 3ef6122e: Merge "Fix an include to get the Samsung file rather than the ↵Elliott Hughes
bionic one." * commit '3ef6122ec331adaaba898ab1f0e24708c0062825': Fix an include to get the Samsung file rather than the bionic one.
2013-11-15Merge "Fix an include to get the Samsung file rather than the bionic one."Elliott Hughes
2013-11-14Fix an include to get the Samsung file rather than the bionic one.Elliott Hughes
Bug: 11559337 Change-Id: Ifb508f36607ee3446d23c0443c5a9b7f9eec03cb
2013-11-14am 102fe28c: prebuilt kernel (wifi TDLS) DO NOT MERGEJP Abgrall
* commit '102fe28c02cdd4eb32312d4fa6fe9033dd9b104c': prebuilt kernel (wifi TDLS) DO NOT MERGE
2013-11-13prebuilt kernel (wifi TDLS) DO NOT MERGEJP Abgrall
a7d7516 net: wireless: bcmdhd: enable TDLS_auto_mode Bug: 11632025 Change-Id: I8ff9d9608c19d75757373bb549401eb65fabdb55
2013-11-12am e0275965: Merge "Update proprietary blobs for manta" into klp-devConley Owens
* commit 'e0275965a471673686cc4736a5095b372ce7c3d6': Update proprietary blobs for manta
2013-11-13Merge "Update proprietary blobs for manta" into klp-devConley Owens
2013-11-12am bcd6c620: prebuilt kernel (fix sync crash in CTS) DO NOT MERGERom Lemarchand
* commit 'bcd6c620dceb8c07ab7e35d934fd8c374722ab13': prebuilt kernel (fix sync crash in CTS) DO NOT MERGE
2013-11-12prebuilt kernel (fix sync crash in CTS) DO NOT MERGERom Lemarchand
Fix includes: 29b0d8e mali: Fix waiting_soft_jobs list corruption during zap context. Bug: 8700991 Change-Id: Id2722cf906d6fe7748a1381ed6f1996b1801f041
2013-11-12am 58078b0e: Merge "Do not use GNU old-style field designators"Nick Kralevich
* commit '58078b0e6e1fc9587c029f71c437c73bfe077f83': Do not use GNU old-style field designators
2013-11-12Merge "Do not use GNU old-style field designators"Nick Kralevich
2013-11-11Do not use GNU old-style field designatorssynergy dev
Avoiding the use of gnu extensions improves code portability Change-Id: I77b81343bc9a802385453f089c55afacf1a05e4a
2013-11-08am 37ee0808: manta: update kernel prebuilt (DO NOT MERGE)Dmitry Shmidt
* commit '37ee080808a90a3ee1ead74314cdc36044079d05': manta: update kernel prebuilt (DO NOT MERGE)
2013-11-07manta: update kernel prebuilt (DO NOT MERGE)Dmitry Shmidt
e37143f net: wireless: bcmdhd: Change DTIM skip policy in suspend 7f863f2 net: wireless: bcmdhd: cancel current PNO if connection will happen 27415bb net: wireless: bcmdhd: reduced the wakelock time of RX packet de27032 net: wireless: bcmdhd: Fixed a problem of buganizer issue (11190960) bfac236 net: wireless: bcmdhd: fixed power consumption issue of P2P. 547d34c net: wireless: bcmdhd: Fix country checking Bug: 11319610, 10874302, 11190960, 11512235, 11174374, 1343127 Change-Id: I2caac94df6b2e4bd1123b187984ce5f39d391e8e Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-11-04am 0963382a: perbuilt kernel (CVE-2013-4348) DO NOT MERGEJP Abgrall
* commit '0963382a7a6208307377c600bedfaf859ec23064': perbuilt kernel (CVE-2013-4348) DO NOT MERGE
2013-11-01perbuilt kernel (CVE-2013-4348) DO NOT MERGEJP Abgrall
d7eda08 net-fixes: flow_dissector: prevent an infinite loop (CVE-2013-4348) Bug: 11482032 Change-Id: I2aee94b08c2150ad5b4fe3c68c30ae37b147da1b
2013-10-31am d5a46926: prebuilt kernel (fix mali driver bug) DO NOT MERGERom Lemarchand
* commit 'd5a469260de1ee27afe9095e1325262c8f61c879': prebuilt kernel (fix mali driver bug) DO NOT MERGE
2013-10-31prebuilt kernel (fix mali driver bug) DO NOT MERGERom Lemarchand
820758f mali: Don't trust length of dma_buf sg list Bug: 11444429 Change-Id: I91878bdd1b40c24f031fe3d800f639b23fea1b54
2013-10-25Update proprietary blobs for mantaConley Owens
Change-Id: Iee8cbc7b5c7f384886a855a895678f5e38865c3b
2013-10-23am 37a7fd9c: prebuilt kernel (fix CTS testPerfEvent2) DO NOT MERGEJP Abgrall
* commit '37a7fd9c2a13bccef3098fbb808875f5175c659d': prebuilt kernel (fix CTS testPerfEvent2) DO NOT MERGE
2013-10-23prebuilt kernel (fix CTS testPerfEvent2) DO NOT MERGEJP Abgrall
79b81c6 ARM: 7809/1: perf: fix event validation for software group leaders e562282 perf/arm: Fix armpmu_map_hw_event() Bug: 11260636 Bug: 11352490 Change-Id: Iac15dbffb71a5e9d543cf153a93ab1c76d5afc21
2013-10-16am d9e54ee2: merge in klp-release (no-op)Ed Heyl
* commit 'd9e54ee2250e4e4ad05a7565ce66fa93557df2f3': prebuilt kernel (fix drm playback) audio: fix remote submix sampling rates
2013-10-16merge in klp-release (no-op)android-cts-4.4_r1kitkat-cts-devEd Heyl
2013-10-15merge in klp-release history after reset to klp-devThe Android Automerger
2013-10-14am 6ffddbc0: prebuilt kernel (fix drm playback)JP Abgrall
* commit '6ffddbc046e2daf13a81467ab3a376e97144071d': prebuilt kernel (fix drm playback)
2013-10-14am 65ddbc2c: Disable translucent bars on Manta.Daniel Sandler
* commit '65ddbc2cc5f310a442ba92d319390edacea92cea': Disable translucent bars on Manta.
2013-10-14prebuilt kernel (fix drm playback)JP Abgrall
b32955c ion: increase MFC OUTPUT buffer size to support high resolution DRM contents Bug: 10858740 Change-Id: I47854453b3f9a33a7f3d8a1f9a0de27fbb3133e9
2013-10-14prebuilt kernel (fix drm playback)JP Abgrall
b32955c ion: increase MFC OUTPUT buffer size to support high resolution DRM contents Bug: 10858740 Change-Id: I47854453b3f9a33a7f3d8a1f9a0de27fbb3133e9
2013-10-14Disable translucent bars on Manta.Daniel Sandler
Requires change I8be6a3a5 in f/b. Bug: 11182618 Change-Id: I1f94f7f79ca49ea94bbec7f52f8301932faee0da
2013-10-09merge in klp-release history after reset to klp-devThe Android Automerger
2013-10-08am 271a323c: merge in KFS78N (no-op)Ed Heyl
* commit '271a323c4b72149651adfe07aa35a184bd575568':
2013-10-08merge in KFS78N (no-op)Ed Heyl
2013-10-08am aa48285b: merge in KQS81MEd Heyl
* commit 'aa48285b1efbdaaca9b321bd02e34742f50759e2': manta: wifi: Override control iface to leave it to global
2013-10-08merge in KQS81MEd Heyl
2013-10-08am b22b08ce: Mute low-battery sounds after one hour with screen off.Daniel Sandler
* commit 'b22b08ce0b67fe478533d1eae26643f9164cb771': Mute low-battery sounds after one hour with screen off.
2013-10-07Mute low-battery sounds after one hour with screen off.Daniel Sandler
Requires change Iddd42038 in frameworks/base. Bug: 10487557 Change-Id: Ic9ccdc504ec65a00140fcd6aaee5df7fd13bff91
2013-10-06merge in klp-release history after reset to klp-devThe Android Automerger
2013-10-04am a42cc61f: Merge "Manta: NFC: Reduce IsoDep TO to 0x02." into klp-devMartijn Coenen
* commit 'a42cc61f6c2993affd85db474eec40d047d5e3a7': Manta: NFC: Reduce IsoDep TO to 0x02.
2013-10-04Merge "Manta: NFC: Reduce IsoDep TO to 0x02." into klp-devMartijn Coenen
2013-10-04Manta: NFC: Reduce IsoDep TO to 0x02.Martijn Coenen
Bug: 10852675 Change-Id: I83de4f40fe5bc5e2d69cc82ddec622d01f716918
2013-10-02am 2da9ddad: manta: health: handle recharging done properlyTodd Poynor
* commit '2da9ddad28538ae1023c0b48c6acf5d62cf9e62f': manta: health: handle recharging done properly
2013-10-02am ef8c2454: new kernel prebuiltGreg Hackmann
* commit 'ef8c245417990eb3ae848cdbf2d4a0a55f4bb4ca': new kernel prebuilt
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 14:44:38 +0000