summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* SF transactions are now O(1) wrt IPC instead of O(N).Mathias Agopian2011-06-2921-496/+451
| | | | Change-Id: I57669852cbf6aabae244ea86940a08a5a27ffc43
* Merge "Ping through default dns & ping settings changes"Irfan Sheriff2011-06-282-20/+43
|\
| * Ping through default dns & ping settings changesIsaac Levy2011-06-282-20/+43
| | | | | | | | | | | | | | | | | | Changed DnsPinger to use the system default DNS if linkprops doesn't have a dns. This mirrors the behavior of the system overall. Minor changes to wifiWatchdogService settings. Change-Id: I8de73cf5bd24bc69343c7d9dc999d198195ec0ec
* | am 846764e5: am d3cc051d: am a6870450: cherrypick from Change-Id: ↵Scott Main2011-06-281-2/+2
|\ \ | | | | | | | | | | | | | | | | | | I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks * commit '846764e5aafc21d2bed9c7fde0b43e9548f96617': cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
| * \ am d3cc051d: am a6870450: cherrypick from Change-Id: ↵Scott Main2011-06-281-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks * commit 'd3cc051dcb05a32eba1c208792e1bde4654a6db3': cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
| | * \ am a6870450: cherrypick from Change-Id: ↵Scott Main2011-06-281-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks * commit 'a687045045157eab2dbf657bb085cb0af68d72f2': cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
| | | * | cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1eScott Main2011-06-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: fix game controller trademarks Change-Id: I1eca030bad5bae0c581000fefffd5d3d49aac205
* | | | | Merge "Add some logging code to track down touch issues."Jeff Brown2011-06-281-1/+11
|\ \ \ \ \
| * | | | | Add some logging code to track down touch issues.Jeff Brown2011-06-281-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9bd7af6b93f82a83c6863986d21e7a222d97e4ae
* | | | | | Merge "Improve input event consistency invariants."Jeff Brown2011-06-286-184/+351
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Improve input event consistency invariants.Jeff Brown2011-06-286-184/+351
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some issues where inconsistent streams of events could be generated by the dispatcher, particularly when switching from hovering with one device to hovering with another. Fixed a bug where the touch pad would fail to generate a new HOVER_MOVE following a tap event. As a result, the hover event stream would not resume until the user touched the touch pad again. Change-Id: I444dce84641fb12e56a0af84c931520771d6c493
* | | | | | am e1918353: am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout ↵Xavier Ducrohet2011-06-280-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | lib changes from hc-mr1." into gingerbread * commit 'e1918353e795d4f4fb67760ad593458517976072': Bring in more layout lib changes from hc-mr1.
| * | | | | am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes ↵Xavier Ducrohet2011-06-280-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from hc-mr1." into gingerbread * commit '842725fc642b7ba2c087cc81796973b838c23c76': Bring in more layout lib changes from hc-mr1.
| | * \ \ \ \ am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into ↵Xavier Ducrohet2011-06-2812-192/+322
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '4d825e1f3bb6b52ecbea6f0c4aa2081b7f1edc89': Bring in more layout lib changes from hc-mr1.
| | | * \ \ \ \ Merge "Bring in more layout lib changes from hc-mr1." into gingerbreadXavier Ducrohet2011-06-2812-192/+322
| | | |\ \ \ \ \
| | | | * | | | | Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1612-192/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe051bb2 : Change the way the layoutlib instantiate its XmlPullParser. A lot of the init code was duplicated so I made a ParserFactory class. Also created an extension of the KXmlPullParser to override toString(). This allows easier debugging when dealing with multiple parsers (which is always the case). Also added some (disabled) debugging printf to deal with parser stack as it can be tricky figuring out which parsers are in the stack at which point. 8969147c : Fix case where the int[] attrs doesn't directly match a styleable. In the case of the FastScroller the int[] is a custom mix of attr instead of a int[] that exists as R.styleable.foo. This makes our reflection based mechanism used to find the styleable fail, so instead we search for each attribute separately (like we probably should have done from the beginning). 0c264b35: Fix various cases of getDimension to report error if unit is missing. if getDimention###() is called for a string that has no unit, then an error is output through LayoutLog, but the rendering keeps going by using dp as a default. 0beb7eea: Make (Bridge)TypedArray.getInteger() call out to getInt() Only getInt() resolved attribute flags/enum and I'm not sure why there's two to begin with. Change-Id: I015111263d2a2bee76834978ae71eef79defdae3
* | | | | | | | | Merge "Record external IP and port from SIP responses"Hung-ying Tyan2011-06-282-10/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Record external IP and port from SIP responsesHung-ying Tyan2011-06-282-10/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and use them to create the contact header when sending OK response for INVITE. Bug: 3461707 Change-Id: I5b254618f4920cf10a1460631bcd336778f344ec
* | | | | | | | | | am 66044737: (-s ours) am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick ↵Xavier Ducrohet2011-06-280-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06942bc4 from hc-mr1. do not merge." into gingerbread * commit '660447379d07f2e7480a30784f04cdd476877d73': CherryPick 06942bc4 from hc-mr1. do not merge.
| * | | | | | | | | am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. ↵Xavier Ducrohet2011-06-280-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not merge." into gingerbread * commit '9bce27a9ce916bdf363667ee67fc0ce50c533aa3': CherryPick 06942bc4 from hc-mr1. do not merge.
| | * | | | | | | | am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into ↵Xavier Ducrohet2011-06-282-4/+9
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '4753498d5c1ac3cf93b0730e77946a95b6913a82': CherryPick 06942bc4 from hc-mr1. do not merge.
| | | * | | | | | | Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbreadXavier Ducrohet2011-06-282-4/+9
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | CherryPick 06942bc4 from hc-mr1. do not merge.Xavier Ducrohet2011-06-162-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layoutlib - use the new getParser callback when possible. Change-Id: I72b867aa573fcc07d610f139da3c90b1b654633c
* | | | | | | | | | am d7542263: (-s ours) am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick ↵Xavier Ducrohet2011-06-280-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 988eeeb5 from hc-mr1. do not merge." into gingerbread * commit 'd7542263c6dfa2522e8844c7c714fbf2ad112385': CherryPick 988eeeb5 from hc-mr1. do not merge.
| * | | | | | | | | am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. ↵Xavier Ducrohet2011-06-280-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not merge." into gingerbread * commit '155cf6c1e191bb03fe24db8663715862d8e6a43d': CherryPick 988eeeb5 from hc-mr1. do not merge.
| | * | | | | | | | am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into ↵Xavier Ducrohet2011-06-283-16/+49
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '9918ffb07f47430e22f6e53576d59b599f5a3534': CherryPick 988eeeb5 from hc-mr1. do not merge.
| | | * | | | | | | Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbreadXavier Ducrohet2011-06-283-16/+49
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | CherryPick 988eeeb5 from hc-mr1. do not merge.Xavier Ducrohet2011-06-163-16/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for custom declare-styleable attr with enum/flag in layoutlib. Change-Id: I8a5b7cc629d61996ffade9aabd9d4d10961eb411
* | | | | | | | | | am adf5914b: (-s ours) am e0947693: (-s ours) am 54146a63: Merge "DO NOT ↵Xavier Ducrohet2011-06-280-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE. may fix build on some version of gcc" into gingerbread * commit 'adf5914b390061e48a86c9f55e68899cfa526841': DO NOT MERGE. may fix build on some version of gcc
| * | | | | | | | | am e0947693: (-s ours) am 54146a63: Merge "DO NOT MERGE. may fix build on ↵Xavier Ducrohet2011-06-280-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some version of gcc" into gingerbread * commit 'e0947693c9984727dfa775a747dd32aaaeb90284': DO NOT MERGE. may fix build on some version of gcc
| | * | | | | | | | am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into ↵Xavier Ducrohet2011-06-281-0/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '54146a634e0e66a5e4732ba1a80079a1e93bdd8a': DO NOT MERGE. may fix build on some version of gcc
| | | * | | | | | | Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbreadXavier Ducrohet2011-06-281-0/+1
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | DO NOT MERGE. may fix build on some version of gccMathias Agopian2011-06-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
* | | | | | | | | | Merge "Better network stats parsing, integer tags, async."Jeff Sharkey2011-06-2811-114/+462
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Better network stats parsing, integer tags, async.Jeff Sharkey2011-06-2811-114/+462
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change NMS parsing to handle extended /proc/ stats formats by pairing values with header keys. Move TrafficStats to integer tags to match kernel internals, and offer well-known tags for system services. Async policy event dispatch from NPMS, and update tests to block for event dispatch. Narrow app policy to exclude apps signed with system key, which are usually critical. Bug: 4948913, 4903489, 4585280 Change-Id: Idb357227ccaa617906411f309371cea18d7bc519
* | | | | | | | | | | am 430cee09: am af08ddbc: am 2f9ad8b4: Add intent actions for new firmware ↵mike wakerly2011-06-281-0/+58
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | events. * commit '430cee0961936746c272aaf5c5f52b1240f6a9b4': Add intent actions for new firmware events.
| * | | | | | | | | | am af08ddbc: am 2f9ad8b4: Add intent actions for new firmware events.mike wakerly2011-06-281-0/+58
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'af08ddbc42fb51de76958d859cf0e87d0b9e475e': Add intent actions for new firmware events.
| | * | | | | | | | | am 2f9ad8b4: Add intent actions for new firmware events.mike wakerly2011-06-281-0/+58
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f9ad8b499cb150d5cdfe84a9795992c5dd42cff': Add intent actions for new firmware events.
| | | * | | | | | | | Add intent actions for new firmware events.mike wakerly2011-06-271-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8129b7812c0d551111f0c85eacc9535a441e5453
* | | | | | | | | | | Merge "Removing unused drawables"Justin Ho2011-06-2810-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removing unused drawablesJustin Ho2011-06-2810-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d7306ee91a47b82dddf42214999edc06903f939
* | | | | | | | | | | | Merge "Fix settings restore even harder"Christopher Tate2011-06-281-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix settings restore even harderChristopher Tate2011-06-281-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If6920743ae92dcf811a87a1eefd357f849c03a23
* | | | | | | | | | | | Merge "2nd try: Gets the URL that has a cert error and carrys it in SslError."Huahui Wu2011-06-283-7/+73
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | 2nd try: Gets the URL that has a cert error and carrys it in SslError.Huahui Wu2011-06-283-7/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Identical to https://android-git.corp.google.com/g/#change,117828 which was reverted since its collaborative CL broke the build. Change-Id: I5fa7d3e9b6026639bf72530ff5b449e36f802914
* | | | | | | | | | | | Merge "Support for writing output data to a provided callback function ↵Andreas Huber2011-06-282-7/+44
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of a file"
| * | | | | | | | | | | | Support for writing output data to a provided callback function instead of a ↵Andreas Huber2011-06-282-7/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file in MPEG2TSWriter Change-Id: Ie54a5677c7b789a973aa50b7f197c6db238425bc
* | | | | | | | | | | | | Merge "Fix battery history management."Dianne Hackborn2011-06-282-19/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix battery history management.Dianne Hackborn2011-06-282-19/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rebooting the history time offset was not being handled correctly, causing garbage data. Change-Id: Ieca5a72c4c7c374bfe7f8673eed87354af148ef0
* | | | | | | | | | | | | | Merge "SurfaceTexture: add a CPU -> GL sync test."Jamie Gennis2011-06-281-0/+176
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-08-28 09:16:22 +0000