summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-06Ensure install-during-restore is like install-then-restoreics-mr1Christopher Tate
When we've installed an apk from the archive, recheck whether to apply the system-uid policy restrictions around file system restores. Bug 8833099 (cherry picked from commit 2baf6dcfcf7fc1705db25e64dc0cb11fa3509d39) Change-Id: Ida5f7493694cb1d7544cd99a9b7a747f92cdb406
2013-04-29libdrm: fix bad strncpy / snprintf callsNick Kralevich
Fix the following bugs reported by IOActive: * GOOGLE-AN01 - Android libdrm drm_parseDM.c Boundary-CRLF Buffer Overflow * GOOGLE-AN02 - Android libdrm 'drm_parseDM.c' contentType-CRLF Buffer Overflow * GOOGLE-AN03 - Android libdrm drm_parseDM.c contentID-CRLF Buffer Overflow * GOOGLE-AN04 - Android libdrm 'parser_dcf.c' Multiple Headers Buffer Overflow * GOOGLE-AN05 - Android libdrm 'parser_dcf.c' ContentType Buffer Overflow Bug: 8727221 (cherry picked from commit 25619b2c6b3fd584affe20f34bfbf164a5ddbe7d) Change-Id: I984a8a6b6314715e2dd3e6c3a83a4fed4642d6a9
2013-04-29Merge "DO NOT MERGE Fix spelling error in backport." into ics-mr1Geremy Condra
2013-04-04DO NOT MERGE Fix spelling error in backport.Geremy Condra
Change-Id: I49f9d2386591542760ca909836eac9f6dca2f154
2013-04-04Merge "DO NOT MERGE Add a delimiter between scheme and host" into ics-mr1Geremy Condra
2013-04-04DO NOT MERGE Add a delimiter between scheme and hostGeremy Condra
Bug: 6923539 Change-Id: Ibd6dce66cd63e14cc72a26710ae339ce089bee11
2013-04-01Validate restored file paths against their nominal domainChristopher Tate
Bug 8460775 (cherry picked from commit 7323765bbf13d9638cf2cc1e06113bffcdac46c4) Change-Id: I6710503799a6df2de142a827513d5b4c107b6ec9
2013-03-01Tighten enforcement of file modes.Jeff Sharkey
Bug: 8275867 Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
2012-11-29Secure a handful of framework broadcastsRobert Greenwalt
At least one of these was getting spoofed in the wild. We don't want to go too far this late in the game, but this is a good start. bug:7622253 (cherry picked from commit 47918ae3b4e7ebb54711884e9ff9d0300591ab8b) Conflicts: core/res/AndroidManifest.xml Change-Id: I85a8c6fa0d38b00db9dd8118864acf09d13a6e01
2012-10-18Layoutlib: Read and close XML files as soon as possible. do not merge.Xavier Ducrohet
Because passing an InputStream to KXML does not close the stream after the file has been parsed, the files are staying locked on windows until the gc and finalizers are run. This change preload the XML files and close their stream, and then pass the content in a stream to the parser. (cherry picked from commit c48b0b940d632b9862ff6aa32665e37fe9e50845) Change-Id: Ic5ab6face61459f40dacd09e25fc8abdbfc5d44b
2012-10-18Update layoutlib for ics. do not merge.Xavier Ducrohet
Status bar displayed on all devices. Update logic for displaying nav bar to whether or not device has soft button. Update navigation buttons to new look. Remove battery and signal from navigation bar. (cherry picked from commit 434cd38f96a4a87220a8218901622f31e567354a) Change-Id: Ie06e81ac2062fd5dbccb025c485877ab2251ef76
2012-10-05DO NOT MERGE Control access to inherited methods of jsinterface objectsSelim Gurun
Bug: 7073422 Create the plumbing to use an annotation to allow access to inherited methods of jsinterface objects. The default webview behavior has not changed yet. However internally an a flag is introduced to restrict javascript access to methods that have an annotation. Change-Id: I0d8091da9b0aaecc0519863cf92b1fec2385da97
2012-09-27DO NOT MERGE : Full (local) restore security changesChristopher Tate
(1) Prevent full restore from creating files/directories that are accessible by other applications (2) Don't restore filesets from "system" packages; i.e. any that runs as a special uid, unless they define their own agent for handling the restore process. Bug 7168284 Cherry-pick of original patch to ics-mr1 Change-Id: I9ff0d527b578b572b27a41b896dbbbcd5fec4730
2012-09-20Merge "DO NOT MERGE Improve focal point tracking" into ics-mr1John Reck
2012-09-14DO NOT MERGE Improve focal point trackingJohn Reck
Change-Id: I2c37b6c0a2fec26cb6fddb00100fe03805101057
2012-09-05DO NOT MERGE remove defunct javascript interfaceSelim Gurun
Bug: 7073422 The feature that is using search box implementation was removed from browser after Honeycomb. This is to remove the js interface that is added for this feature. Change-Id: I0b0c7aec16d9c06e1511a33b58fb7813e155a946
2012-08-29DO NOT MERGE Code simplificationJohn Reck
Change-Id: I2621f1449ac5f43e2e19da0e3b260ccc2b30be5f
2012-08-17Don't log streaming uri in ChromiumHTTPDataSource. DO NOT MERGE.James Dong
o related-to-bug: 6994761 Change-Id: Ic9642edd7b86b4d7543e0f5d397a571976d7e7db
2012-07-25Make lib dir before changing ownership of app dirGeremy Condra
Backport of jb fix, change I8998a50359892277b15e80b5b5590ff94b125467 Change-Id: Ia6b3aa503d969005aa11df43e6eee7aaf11521b0
2012-06-29Merge "Import translations. DO NOT MERGE" into ics-mr1Ying Wang
2012-06-29Merge "Revert "DO NOT MERGE Content detector tweaks"" into ics-mr1John Reck
2012-06-29Revert "DO NOT MERGE Content detector tweaks"John Reck
This reverts commit f0bc4d9c033d31e6dd3994b8d111a8cf53fe8d3f
2012-06-29Revert "DO NOT MERGE Porting the new lock screen from JellyBean to ICS MR1."Jim Miller
This reverts commit 063631225c30651fa83e1a3433fb229bed0f7ed9
2012-06-29Import translations. DO NOT MERGEYing Wang
Change-Id: I97a724b67a8d016bbc0a4122148227f1caf7d95c Auto-generated-cl: translation import
2012-06-27DO NOT MERGE Porting the new lock screen from JellyBean to ICS MR1.Jim Miller
bug:6743068 Change-Id: Ie2b211bfe4676d2bc9dc2edda87706202e71837a
2012-06-23Merge "docs: fix session number for io" into ics-mr1Scott Main
2012-06-23docs: fix session number for ioScott Main
Change-Id: I953f6244d1fea20d61595123e3a11bd8692f7237
2012-06-22Doc change: review comments on Distribute section.Dirk Dougherty
Change-Id: I05370ebbd642fdd7d39f7854ee03f2b06271a1cb
2012-06-21Merge "docs: delete crusty old Japanese homepage" into ics-mr1Scott Main
2012-06-21docs: delete crusty old Japanese homepageScott Main
Change-Id: Ieeec30816e4d40e8f7d304861582ed02e3a0eced
2012-06-21Doc change: remove ja index file.Dirk Dougherty
Change-Id: I7f308137fe87d7ee30f1a1b6ecd1fc08f2565a86
2012-06-21docs: fix intro sentence for tools pageScott Main
Change-Id: I798da476e15f184957630536974299a4a67b31d6
2012-06-21docs: change IDE to Dev ToolsScott Main
Change-Id: I9679847c14df663ecb0ac303f48ad3d8cf6683a0
2012-06-21Merge "Doc change: change links to static article." into ics-mr1Dirk Dougherty
2012-06-21Doc change: change links to static article.Dirk Dougherty
Change-Id: I3768e7a3a4a16fd2b6a1349ae98f34b5a8ba12d5
2012-06-21Doc change: minor adjustments for dac.Dirk Dougherty
Change-Id: I6eca4405709f5246b295434739fe4ad8ddcdeca8
2012-06-21Merge "docs: delete unused images for space constraint" into ics-mr1Scott Main
2012-06-21docs: delete unused images for space constraintScott Main
Change-Id: I6a853a217cb74797e50d76e9a84201ffef97ee14
2012-06-21Merge "docs: add images needed by articles IME and Spell Checker (in dev ↵Scott Main
guide)" into ics-mr1
2012-06-21docs: add images needed by articles IME and Spell Checker (in dev guide)Scott Main
Change-Id: I48e43a5fa95f955d0ef74cce97ac15a5606708e2
2012-06-21Merge "doc change: blurb for extras." into ics-mr1Dirk Dougherty
2012-06-21doc change: blurb for extras.Dirk Dougherty
Change-Id: I8d828fcd2afc5e6efc3d867d6b13892c9edf68df
2012-06-21docs: add permissions back to the guideScott Main
Change-Id: Iac530df2b54bd36151e8b5d133e85d664e73228e
2012-06-21docs: MOAR linksScott Main
Change-Id: I4bc1947f84dab16692065957a3a955d7338d4262
2012-06-21docs: re-add old sdk pages for prosperityScott Main
Change-Id: I76acc94eba682b9d4ef7d5edeb11c8c3e8d6bc6d
2012-06-21docs: fix misc links and re-add the FAQ docs for prosperityScott Main
Change-Id: I1da43b196319b89cc72dfde1cfe5d0c759b72340
2012-06-21Merge "Doc change: edits to monetizing and visibility." into ics-mr1Dirk Dougherty
2012-06-21Doc change: edits to monetizing and visibility.Dirk Dougherty
Change-Id: Ibf94519e0975ad898d2025175078a5e12bb54e0f
2012-06-21Doc change: add Google Services page.Dirk Dougherty
Change-Id: I4ae57830debe68635b195a290373d0806ff66535
2012-06-21docs: clean up some pages under AboutScott Main
Change-Id: Id64d75ffff8bd09176b0b40a838e3edbdd6216ee