summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "resubmitting Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9"Vasu Nori2010-12-216-9/+41
|\
| * resubmitting Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9Vasu Nori2010-12-216-9/+41
| | | | | | | | | | Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9 was reverted due to a bug. fixed the bug and resubmitting it here
* | Retrying sending proxy changes to webkitKristian Monsen2010-12-213-0/+51
| | | | | | | | | | | | | | Now checking if the ProxyProperties object is null, and if the string returned by getHost() is null. Change-Id: I727e26c2a41fe057501c3b610ba6fa221d16da45
* | Add a parameter to InputMethodManagerService.getEnabledSubtype for allowing ↵satok2010-12-215-12/+77
|/ | | | | | | | to select subtypes implicitly if no subtype is enabled. Bug: 3142286 Change-Id: I92d019d0648c552e6d7695c3530aa81ae054d702
* Merge "Ensure bitmaps aren't freed while referenced from a display list"Patrick Dubroy2010-12-208-182/+301
|\
| * Ensure bitmaps aren't freed while referenced from a display listPatrick Dubroy2010-12-208-182/+301
| | | | | | | | | | Also removes the reference queue finalizers. They aren't necessary anymore now that Bitmaps are allocated in the heap.
* | Merge "Revert "Merge "Send proxy changes on the webcore thread to WebKit"""Huahui Wu2010-12-203-50/+0
|\ \
| * | Revert "Merge "Send proxy changes on the webcore thread to WebKit""Huahui Wu2010-12-203-50/+0
| | | | | | | | | | | | | | | This reverts commit ea8f4e0d667b1da70960e35f16ed371ffb4ad2ed, reversing changes made to fd4dda8d77231db01b26686f61601a999a2d96f3.
* | | Merge "Clean up Allocation buffer object api."Jason Sams2010-12-204-56/+20
|\ \ \
| * | | Clean up Allocation buffer object api.Jason Sams2010-12-204-56/+20
| | | | | | | | | | | | | | | | Change-Id: Id3e2391a93a99f4c414a805ee33cfd113242a7e6
* | | | Merge "Revert "bug:2448371 cursorwindow size moved to resource xml file.""Vasu Nori2010-12-206-44/+9
|\ \ \ \
| * | | | Revert "bug:2448371 cursorwindow size moved to resource xml file."Vasu Nori2010-12-206-44/+9
| | | | | | | | | | | | | | | | | | | | This reverts commit 2594bae1f551d758c5c88771310d1ee3dc2c71ac.
* | | | | Merge "Make sure background drawables are correct when View is attached"Chet Haase2010-12-201-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make sure background drawables are correct when View is attachedChet Haase2010-12-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Books had a bug where the search menu item would come back with an out of date background color. The problem was that the logic to change the background color was tied into StateListDrawable animations. These animations were not always completing because the action bar would remove the associated View and the drawable animations would stop being scheduled (no handler to post to). The fix is to always set the drawable state to the current state when a View is added to the hierarchy. Change-Id: I0fc8008381f7439b9e49d6449ae618512c8e9dd0
* | | | | Merge "More cleanup of Loader APIs."Dianne Hackborn2010-12-2010-125/+386
|\ \ \ \ \
| * | | | | More cleanup of Loader APIs.Dianne Hackborn2010-12-2010-125/+386
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove old method names. - Introduce onXxx() hooks to Loader. - Improve debugging. Change-Id: I3fba072a05c7023aa7d2c3eb4e126feb514ab6d8
* | | | | Merge "bug:2448371 cursorwindow size moved to resource xml file."Vasu Nori2010-12-206-9/+44
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | bug:2448371 cursorwindow size moved to resource xml file.Vasu Nori2010-12-206-9/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | let cursor window size be set per device in device resources file. default is 1MB. for SR, it is 2MB. it can be set to any value (in kB) in the device resource strings.xml file Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9
* | | | | Merge "Backward-compatibility max file size support, ignoring 0 or negative ↵James Dong2010-12-201-1/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | file size limit"
| * | | | | Backward-compatibility max file size support, ignoring 0 or negative file ↵James Dong2010-12-201-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size limit bug - 3281011 Change-Id: I2d3ae4565602e2374ca794c5e8d0837ad33cf0e8
* | | | | | am 0655b31d: am 12b82c8d: Merge "Unhide RecognizerResultsIntent. This API ↵Mike LeBeau2010-12-202-17/+89
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was reviewed for Froyo, but we didn\'t want to make it public then because it wasn\'t until our first Market release of Voice Search that the APIs would be in use by our app." into gingerbread * commit '0655b31d758ce8fe054c98c6d288e424f2d273e2': Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app.
| * \ \ \ \ \ am 12b82c8d: Merge "Unhide RecognizerResultsIntent. This API was reviewed ↵Mike LeBeau2010-12-202-17/+89
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for Froyo, but we didn\'t want to make it public then because it wasn\'t until our first Market release of Voice Search that the APIs would be in use by our app." into gingerbread * commit '12b82c8da7bc477e591b12d8b7e469a9ba6dd574': Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app.
| | * \ \ \ \ \ Merge "Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but ↵Mike LeBeau2010-12-202-17/+89
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app." into gingerbread
| | | * | | | | | Unhide RecognizerResultsIntent. This API wasMike LeBeau2010-12-202-17/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reviewed for Froyo, but we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app. http://b/3135351 Change-Id: I49053717cac08e3976c22e3a105139b6755aadb8
* | | | | | | | | am e1df8e9b: am 00410256: cherrypick Change-Id: ↵Scott Main2010-12-201-4/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos * commit 'e1df8e9be8e3a9969cf0d3594946abe0aa410c1e': cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos
| * | | | | | | | am 00410256: cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 ↵Scott Main2010-12-201-4/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: fix typos * commit '00410256a667866b0b9d12b513688d3894140b73': cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos
| | * | | | | | | cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954Scott Main2010-12-201-4/+3
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: fix typos Change-Id: Ic31053b1a17b8b2e0842ba6077ad635e642dc705
* | | | | | | | am d8a98cf0: (-s ours) am c724f2fb: disable the bypass mode. DO NOT MERGE.Mathias Agopian2010-12-200-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8a98cf0a30dbb95ea2fcc8dfe2fe37d670d243e': disable the bypass mode. DO NOT MERGE.
| * | | | | | | am c724f2fb: disable the bypass mode. DO NOT MERGE.Mathias Agopian2010-12-201-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c724f2fba330da275f46586aeb5f0ae7bd2fae99': disable the bypass mode. DO NOT MERGE.
| | * | | | | | disable the bypass mode. DO NOT MERGE.Mathias Agopian2010-12-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SF bypass mode triggers a bug in the display controller that case cause the device to freeze. Change-Id: If29b4d5132f463d13831b082b904c235f15a19fb
* | | | | | | | am 07249236: am ab82a5b9: Clean up and polish Mifare Classic tech.Martijn Coenen2010-12-201-17/+74
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '07249236fcef7ef0603b9978ec3b420f247b51cb': Clean up and polish Mifare Classic tech.
| * | | | | | | am ab82a5b9: Clean up and polish Mifare Classic tech.Martijn Coenen2010-12-201-17/+74
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ab82a5b9a841cf052310e8500224932b9f5e3cad': Clean up and polish Mifare Classic tech.
| | * | | | | | Clean up and polish Mifare Classic tech.Martijn Coenen2010-12-171-17/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - It's useful to have accessors at block level, so apps don't really have to know about the sector structure (and how many blocks there are in a sector). - There's no way to tell whether a read/write/ didn't work because of auth failure. The documentation should be changed to make this point clear. - Added increment/decrement commands, for atomic increment/decrement of value blocks. Change-Id: I590feacbcd1443f1be7a86ab046a5b1f33e2e04c
* | | | | | | | am d485c76b: am c8e8a12b: Merge "Fix issue #3289835: NullPointerException ↵Dianne Hackborn2010-12-201-1/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in..." into gingerbread * commit 'd485c76b5e09a8c311f8f129cbe5ec75499556be': Fix issue #3289835: NullPointerException in...
| * | | | | | | am c8e8a12b: Merge "Fix issue #3289835: NullPointerException in..." into ↵Dianne Hackborn2010-12-201-1/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'c8e8a12b3c649bbaf610d2ff17bb10a7b32fe579': Fix issue #3289835: NullPointerException in...
| | * | | | | | Merge "Fix issue #3289835: NullPointerException in..." into gingerbreadDianne Hackborn2010-12-171-1/+4
| | |\ \ \ \ \ \
| | | * | | | | | Fix issue #3289835: NullPointerException in...Dianne Hackborn2010-12-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ..PackageManagerService.grantPermissionsLP when updating system app Change-Id: I36c1b96d2fe9a8737843d30f3a2669935fc281bb
* | | | | | | | | am d90bc225: am a936b256: Remove SIP realm/domain checkHung-ying Tyan2010-12-201-6/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd90bc225b9d6e4f8f69d984aa63062a7b20ac65c': Remove SIP realm/domain check
| * | | | | | | | am a936b256: Remove SIP realm/domain checkHung-ying Tyan2010-12-201-6/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a936b256eb1611b5d8b88d0cd61f21225152cc82': Remove SIP realm/domain check
| | * | | | | | | Remove SIP realm/domain checkHung-ying Tyan2010-12-171-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as the realm may be different from the domain. Bug: 3283834 Change-Id: I64c9f0d6d626afdb397c5d378d30afa9d6a64ca9
* | | | | | | | | am 87792491: am acf64935: Merge "Check port in create peer\'s SIP profile." ↵Hung-ying Tyan2010-12-200-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread * commit '877924912abd4c368597ca11c732af6623208c6b': Check port in create peer's SIP profile.
| * | | | | | | | am acf64935: Merge "Check port in create peer\'s SIP profile." into gingerbreadHung-ying Tyan2010-12-202-5/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'acf649356b1ab25098277018b5d76f55f9ef660b': Check port in create peer's SIP profile.
| | * | | | | | | Merge "Check port in create peer's SIP profile." into gingerbreadHung-ying Tyan2010-12-162-5/+7
| | |\ \ \ \ \ \ \
| | | * | | | | | | Check port in create peer's SIP profile.Hung-ying Tyan2010-12-162-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SipURI returns port -1 when port is not present in the URI. Don't call SipProfile.Builder.setPort() when that happens. Bug: 3291248 Change-Id: I8e608cbc56ea82862df55fdba885f6a864db83ab
* | | | | | | | | | am 623baf8e: am 29f9ee97: Merge "Need to check ndef before writing ndef." ↵Nick Pelly2010-12-201-11/+17
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread * commit '623baf8edb5301ee412a428a5b25ea38d7b39f91': Need to check ndef before writing ndef.
| * | | | | | | | | am 29f9ee97: Merge "Need to check ndef before writing ndef." into gingerbreadNick Pelly2010-12-201-11/+17
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '29f9ee973eefea3c68382ed38e69db1f1a396f3f': Need to check ndef before writing ndef.
| | * | | | | | | | Merge "Need to check ndef before writing ndef." into gingerbreadNick Pelly2010-12-161-11/+17
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Need to check ndef before writing ndef.Martijn Coenen2010-12-161-11/+17
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression due to all the (re)connect changes. Change-Id: I637618f63518965e893a5a59db61002271666fa4
* | | | | | | | | | am cdd76cf5: am 0d1e38ef: cherrypick Change-Id: ↵Scott Main2010-12-201-7/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference * commit 'cdd76cf5873ee709d04ffeda6e56c5f15bfa1bba': cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference
| * | | | | | | | am 0d1e38ef: cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c ↵Scott Main2010-12-201-7/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: misc fixes to the drawable reference * commit '0d1e38ef99252cb14e6bcc4b3135021da025330f': cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference
generated by cgit v1.1 at 2025-02-04 05:00:27 +0000