summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 17da0663: Merge "fix [2931161] crash in labyritnth when completing a ↵Mathias Agopian2010-08-181-32/+35
|\ | | | | | | | | | | | | | | | | level" into gingerbread Merge commit '17da06631041f9f2237738fb673a74a85b1d9cf4' into gingerbread-plus-aosp * commit '17da06631041f9f2237738fb673a74a85b1d9cf4': fix [2931161] crash in labyritnth when completing a level
| * Merge "fix [2931161] crash in labyritnth when completing a level" into ↵Mathias Agopian2010-08-181-32/+35
| |\ | | | | | | | | | gingerbread
| | * fix [2931161] crash in labyritnth when completing a levelMathias Agopian2010-08-181-32/+35
| | | | | | | | | | | | Change-Id: I821d67effaf73d7008b2828d06f5489d1f976a1e
* | | am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" ↵Robert Greenwalt2010-08-181-1/+29
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6' into gingerbread-plus-aosp * commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6': DO NOT MERGE Do not kill sockets going default->hipri
| * | Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbreadRobert Greenwalt2010-08-181-1/+29
| |\ \ | | |/ | |/|
| | * DO NOT MERGE Do not kill sockets going default->hipriRobert Greenwalt2010-08-181-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | A usecase is to use hipri to keep alive 3g connections when wifi is about to be brought up. They are the same network, so don't reset unless both are down. Change-Id: I8dabc42f315943b28ea34721793b0ee330c07bf6
* | | am 11709ab0: Merge "Avoid unnecessary SharedPrefences disk writes." into ↵Brad Fitzpatrick2010-08-181-6/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '11709ab07ca2eb97dfa3fc7bb3e0996e65908ade' into gingerbread-plus-aosp * commit '11709ab07ca2eb97dfa3fc7bb3e0996e65908ade': Avoid unnecessary SharedPrefences disk writes.
| * | Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbreadBrad Fitzpatrick2010-08-181-6/+28
| |\ \
| | * | Avoid unnecessary SharedPrefences disk writes.Brad Fitzpatrick2010-08-171-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps commonly edit + commit redundant changes to their SharedPreferences, not checking the existing values. Rather than force all apps to double-check that their settings writes aren't redundant, we should just make .commit() faster (avoiding the disk write) when the file already exists on disk and no effective changes were made. Change-Id: I7edbd0d3ace5b69b7af6d12c39797c8b7f86230b
* | | | am aac6a748: Merge "Only monitor recognized uevent devices." into gingerbreadJean-Baptiste Queru2010-08-181-1/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'aac6a7481757e3477e489f311e53385988a5d9a0' into gingerbread-plus-aosp * commit 'aac6a7481757e3477e489f311e53385988a5d9a0': Only monitor recognized uevent devices.
| * | | Merge "Only monitor recognized uevent devices." into gingerbreadJean-Baptiste Queru2010-08-181-1/+8
| |\ \ \
| | * | | Only monitor recognized uevent devices.Sean McNeil2010-08-181-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system_server can potentially monitor uevent devices that are of no use to it. For instance, an accelerometer implementation as uevents. This would cause the process to be busy when unnecessary. If a device cannot be classified, don't monitor it. Change-Id: Ib2c93105e7d746d9c1a7414bea8bab3fb8c0b70a
* | | | | am 8ad86fef: Merge "Improve documentation of getAltitude" into gingerbreadMathias Agopian2010-08-181-1/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8ad86fef49a732617dc26be9324af60f9975342d' into gingerbread-plus-aosp * commit '8ad86fef49a732617dc26be9324af60f9975342d': Improve documentation of getAltitude
| * | | | Merge "Improve documentation of getAltitude" into gingerbreadMathias Agopian2010-08-181-1/+16
| |\ \ \ \
| | * | | | Improve documentation of getAltitudeMathias Agopian2010-08-181-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie6c61fa6018e54143cec6e65978df9abb48854d9
* | | | | | am 26bcc7b4: Merge "revert hwcomposer HAL changes. DO NOT MERGE." into ↵Mathias Agopian2010-08-1811-360/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '26bcc7b44238ea54105ef5a6020fa5c37bb33f03' into gingerbread-plus-aosp * commit '26bcc7b44238ea54105ef5a6020fa5c37bb33f03': revert hwcomposer HAL changes. DO NOT MERGE.
| * | | | | Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbreadMathias Agopian2010-08-1811-360/+9
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | revert hwcomposer HAL changes. DO NOT MERGE.Mathias Agopian2010-08-1711-360/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit: 94364b91a2894bf037b8beb027132fbb812e1434 f8e705dea48f77f1c2532fdbadd4997dd1851af0 b59beb5ca68d0228f60dda60d85e2d0226b33215 e0d5f5bcf5a8b26f4ad75f549cbf380b2c9faf20
* | | | | | Merge "fix build" into gingerbread-plus-aospJean-Baptiste Queru2010-08-181-2/+0
|\ \ \ \ \ \
| * | | | | | fix buildJean-Baptiste Queru2010-08-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I13a6a34e8eae73b046769df365be8a46489bd111
* | | | | | | am 72e0b2ab: Merge "Fix some input device mapping bugs with certain ↵Jeff Brown2010-08-182-82/+96
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers." into gingerbread Merge commit '72e0b2ab08dc49857955a4560de296fdddada8dc' into gingerbread-plus-aosp * commit '72e0b2ab08dc49857955a4560de296fdddada8dc': Fix some input device mapping bugs with certain drivers.
| * | | | | | Merge "Fix some input device mapping bugs with certain drivers." into ↵Jeff Brown2010-08-182-82/+96
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | * | | | | | Fix some input device mapping bugs with certain drivers.Jeff Brown2010-08-182-82/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On single-touch devices, pointer up/down is signalled by a BTN_TOUCH key event. Previously we handled BTN_TOUCH immediately but some drivers may produce the sequence BTN_TOUCH, ABS_X, ABS_Y, SYN_REPORT on pointer down which caused us to emit a bad initial pointer down location. Now we wait for SYN_REPORT before reporting the up or down. On multi-touch devices, pointer up can be signalled by as little as the sequence SYN_MT_REPORT, SYN_REPORT. This change ensures that we handle this case. Added support for reading ABS_MT_PRESSURE when available. Corrected mapping of touchMajor/touchMinor on single touch devices. Minor code cleanup. Change-Id: Ic7ec4811241ed85a06e59b8a839ca05180d491d4
* | | | | | | | am f2af87b3: Merge "Making sure the draw time is measured." into gingerbreadKonstantin Lopyrev2010-08-181-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f2af87b39b294a197b9a7aaa611a14cfcd669a16' into gingerbread-plus-aosp * commit 'f2af87b39b294a197b9a7aaa611a14cfcd669a16': Making sure the draw time is measured.
| * | | | | | | Merge "Making sure the draw time is measured." into gingerbreadKonstantin Lopyrev2010-08-181-1/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Making sure the draw time is measured.Konstantin Lopyrev2010-08-181-1/+2
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | Change-Id: I6bf8094aee03793f125008386c4fea730e95d07a
* | | | | | | am c4554b9a: Keep track of remaining fd when devices are removedJens Gulin2010-08-180-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c4554b9a0885ac3713575e91d8d33c5670b52322' into gingerbread-plus-aosp * commit 'c4554b9a0885ac3713575e91d8d33c5670b52322': Keep track of remaining fd when devices are removed
| * | | | | | Keep track of remaining fd when devices are removedJens Gulin2010-08-182-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the wrong fd was accessed when the device was addressed by device id. The earlier implementation assumed that two arrays were in sync but one of them was compacted when devices were removed. Instead of that dependency the device now keeps track of it's file descriptor. Change-Id: Ib0f320603aafb07ded354bc3687de9759c9068f2
* | | | | | | am d313cab4: Merge "tracking merge of external/apache-http from dalvik-dev" ↵Brian Carlstrom2010-08-182-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'd313cab46e07c40f4cd1a94304a553e7eb809190' into gingerbread-plus-aosp * commit 'd313cab46e07c40f4cd1a94304a553e7eb809190': tracking merge of external/apache-http from dalvik-dev
| * | | | | | Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbreadBrian Carlstrom2010-08-182-2/+2
| |\ \ \ \ \ \
| | * | | | | | tracking merge of external/apache-http from dalvik-devBrian Carlstrom2010-08-182-2/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I25d7659b25f86f88cb36b4f80589b8c3e3a8c6b2
* | | | | | | am c8696023: Merge "Document that autoFocus must be called in auto and macro ↵Wu-cheng Li2010-08-182-5/+18
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode." into gingerbread Merge commit 'c86960236d5b2095c87bf46de2400a905acabee2' into gingerbread-plus-aosp * commit 'c86960236d5b2095c87bf46de2400a905acabee2': Document that autoFocus must be called in auto and macro mode.
| * | | | | | Merge "Document that autoFocus must be called in auto and macro mode." into ↵Wu-cheng Li2010-08-182-5/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | * | | | | | Document that autoFocus must be called in auto and macro mode.Wu-cheng Li2010-08-172-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia52f8bc8a75a7473edff50326a4a0467f4295e6a
* | | | | | | | am 4dda6ddb: Merge "Make the OggExtractor less verbose." into gingerbreadAndreas Huber2010-08-181-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4dda6ddb25e904c17dcb3012dd229df6ae4692cd' into gingerbread-plus-aosp * commit '4dda6ddb25e904c17dcb3012dd229df6ae4692cd': Make the OggExtractor less verbose.
| * | | | | | | Merge "Make the OggExtractor less verbose." into gingerbreadAndreas Huber2010-08-181-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Make the OggExtractor less verbose.Andreas Huber2010-08-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieea5f3fa98d93ca6ad8fa7dcd23054e1cd0b6338
* | | | | | | | | am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 ↵Andreas Huber2010-08-181-0/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread Merge commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68' into gingerbread-plus-aosp * commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68': Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
| * | | | | | | | Merge "Be more lenient when validating ESDS information in mp4 audio tracks. ↵Andreas Huber2010-08-181-0/+8
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread
| | * | | | | | | | Be more lenient when validating ESDS information in mp4 audio tracks. Allow ↵Andreas Huber2010-08-181-0/+8
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the absence of any codec specific data and assume that the mpeg4 headers are not lying to us. Change-Id: Ia29b967cbee9eabb21c6c26508b27b379ff9ba17
* | | | | | | | | am baf3869b: Merge "Fix up handling of null fields in DownloadManager." into ↵Steve Howard2010-08-181-9/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8' into gingerbread-plus-aosp * commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8': Fix up handling of null fields in DownloadManager.
| * | | | | | | | Merge "Fix up handling of null fields in DownloadManager." into gingerbreadSteve Howard2010-08-181-9/+16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix up handling of null fields in DownloadManager.Steve Howard2010-08-171-9/+16
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document fields that can have invalid/unknown values, and fix handling of null local URI. Change-Id: I7684c151f0a20c91340655246bec2ce0a60328e4
* | | | | | | | | am face0c02: am 46906276: Amend previous ndc commitKenny Root2010-08-180-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'face0c02a0c47f8585fa578d5a85a8fc37322326' into gingerbread-plus-aosp * commit 'face0c02a0c47f8585fa578d5a85a8fc37322326': Amend previous ndc commit
| * | | | | | | | am 46906276: Amend previous ndc commitKenny Root2010-08-180-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '46906276448dd36e7a5cca38fbe9fdb3142f7948' into gingerbread * commit '46906276448dd36e7a5cca38fbe9fdb3142f7948': Amend previous ndc commit
| | * | | | | | | | Amend previous ndc commitKenny Root2010-08-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submitted wrong patchset. This includes the delta for the latest patchset. Change-Id: I63bb9a37dd9100550ae07a3a1c9fdd9fd71724e1
* | | | | | | | | | am e2f95e42: am a34c9ca3: (-s ours) Add more error checking for ndcKenny Root2010-08-180-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e2f95e42c2ba27c7739b80ab9f52d1acfe1643e7' into gingerbread-plus-aosp * commit 'e2f95e42c2ba27c7739b80ab9f52d1acfe1643e7': Add more error checking for ndc
| * | | | | | | | | am a34c9ca3: (-s ours) Add more error checking for ndcKenny Root2010-08-180-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a34c9ca30ea25d0c4d8ae51da7858c4ea58b7f25' into gingerbread * commit 'a34c9ca30ea25d0c4d8ae51da7858c4ea58b7f25': Add more error checking for ndc
| | * | | | | | | | Add more error checking for ndcKenny Root2010-08-173-113/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In NativeDaemonConnector.doCommand() calls, there was inconsistent error checking. This change adds error checking for every call and makes it so that any call to .doCommand() that gets an error code won't cause the code to hang forever. Change-Id: If714282b6642f278fb8137f652af1a012670253b
* | | | | | | | | | am a6b47cd3: am 24a03083: PackageManagerService: always install native ↵David 'Digit' Turner2010-08-180-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binaries from .apk Merge commit 'a6b47cd39a1aa01d807bc24839863ce0a0218b46' into gingerbread-plus-aosp * commit 'a6b47cd39a1aa01d807bc24839863ce0a0218b46': PackageManagerService: always install native binaries from .apk