summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 45bd9946: am fec5d38b: Merge "option to enable multisampling" into ↵Mathias Agopian2010-09-091-61/+71
|\ | | | | | | | | | | | | | | | | gingerbread Merge commit '45bd99466ce9962778eacaefff1c0a44bb268f0c' * commit '45bd99466ce9962778eacaefff1c0a44bb268f0c': option to enable multisampling
| * am fec5d38b: Merge "option to enable multisampling" into gingerbreadMathias Agopian2010-09-091-61/+71
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2' into gingerbread-plus-aosp * commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2': option to enable multisampling
| | * Merge "option to enable multisampling" into gingerbreadMathias Agopian2010-09-091-61/+71
| | |\
| | | * option to enable multisamplingMathias Agopian2010-09-091-61/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | multisampling can be enabled by specifying the number of samples desired on the command line. Change-Id: I5f93c93ae7ada54bcd646c1065e07890d0cb9808
* | | | am 1ed20dc4: am e3692d15: Merge "Hidden API to control sorting of download ↵Steve Howard2010-09-092-5/+52
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | manager queries." into gingerbread Merge commit '1ed20dc43b070903597c55738f342bc77f7ab21d' * commit '1ed20dc43b070903597c55738f342bc77f7ab21d': Hidden API to control sorting of download manager queries.
| * | | am e3692d15: Merge "Hidden API to control sorting of download manager ↵Steve Howard2010-09-092-5/+52
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | queries." into gingerbread Merge commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04' into gingerbread-plus-aosp * commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04': Hidden API to control sorting of download manager queries.
| | * | Merge "Hidden API to control sorting of download manager queries." into ↵Steve Howard2010-09-092-5/+52
| | |\ \ | | | |/ | | |/| | | | | gingerbread
| | | * Hidden API to control sorting of download manager queries.Steve Howard2010-09-092-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a hidden API to sort download manager queries by size rather than by time last modified. This is necessary for the system download manager UI but, in the interest of keeping the new public API as minimal as possible for now, I'm leaving @hide on this method. This change also changes the DownloadManager.COLUMN_ID column to be identical to BaseColumns._ID, since some code relies on this (such as CursorAdapter). Change-Id: Ib89b614d63e988974d4486b122b39365b35b5269
* | | | am a9ff29b5: am 6808e6a8: Merge "Fix a few typos in EGL wrapper" into ↵Mathias Agopian2010-09-091-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'a9ff29b59cf33e552285a0bff3caf7a44f93f1c0' * commit 'a9ff29b59cf33e552285a0bff3caf7a44f93f1c0': Fix a few typos in EGL wrapper
| * | | am 6808e6a8: Merge "Fix a few typos in EGL wrapper" into gingerbreadMathias Agopian2010-09-091-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '6808e6a867ba0b32f8bd97163e134c2866423f01' into gingerbread-plus-aosp * commit '6808e6a867ba0b32f8bd97163e134c2866423f01': Fix a few typos in EGL wrapper
| | * | Merge "Fix a few typos in EGL wrapper" into gingerbreadMathias Agopian2010-09-091-2/+2
| | |\ \ | | | |/ | | |/|
| | | * Fix a few typos in EGL wrapperMathias Agopian2010-09-091-2/+2
| | | | | | | | | | | | | | | | Change-Id: I3b815ca6ec334ca12088f9721eece33df42b2e46
* | | | am 049912b7: am 9395b465: Merge "Fix to get A2DP to connect after unpairing" ↵Jaikumar Ganesh2010-09-091-1/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '049912b76f320c55cfe56394e520ee2c35f913b8' * commit '049912b76f320c55cfe56394e520ee2c35f913b8': Fix to get A2DP to connect after unpairing
| * | | am 9395b465: Merge "Fix to get A2DP to connect after unpairing" into gingerbreadJaikumar Ganesh2010-09-091-1/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '9395b4656aca4b00d080ada89a44631459ad7b85' into gingerbread-plus-aosp * commit '9395b4656aca4b00d080ada89a44631459ad7b85': Fix to get A2DP to connect after unpairing
| | * | Merge "Fix to get A2DP to connect after unpairing" into gingerbreadJaikumar Ganesh2010-09-091-1/+7
| | |\ \
| | | * | Fix to get A2DP to connect after unpairingHenrik Backlund2010-09-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this fix, A2DP profile will be connected when pairing with a previously paired headset. The reason for this error was that the connection of the A2DP profile was sent before the callback onCreatePairedDeviceResult was receied in BluetoothEventLoop.java. By not going to the state BOND_BONDED until after this callback has been received, the problem is fixed. However the use case is different if the pairing is initiated by the remote device. In these cases state BOND_BONDED will be set when onDevicePropertyChanged instead. Change-Id: I5dedca87d0a6872705ff3a933a99cce6eb37618a
* | | | | am 8986f62b: am f3de053c: Merge "Instead of asserting return a runtime error ↵Andreas Huber2010-09-091-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the maximum sample size cannot be determined." into gingerbread Merge commit '8986f62b30e494b68476ff8ef81acd4b1dd22674' * commit '8986f62b30e494b68476ff8ef81acd4b1dd22674': Instead of asserting return a runtime error if the maximum sample size cannot be determined.
| * | | | am f3de053c: Merge "Instead of asserting return a runtime error if the ↵Andreas Huber2010-09-091-1/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maximum sample size cannot be determined." into gingerbread Merge commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e' into gingerbread-plus-aosp * commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e': Instead of asserting return a runtime error if the maximum sample size cannot be determined.
| | * | | Merge "Instead of asserting return a runtime error if the maximum sample ↵Andreas Huber2010-09-091-1/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | size cannot be determined." into gingerbread
| | | * | | Instead of asserting return a runtime error if the maximum sample size ↵Andreas Huber2010-09-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cannot be determined. Change-Id: Icf17ed04323f5415e0f9f1e4fd9f19ca60ce15ac related-to-bug: 2602446
* | | | | | am e19df3dc: am 5c43a7af: Merge "When 32-bit offset is used, if the ↵James Dong2010-09-091-3/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread Merge commit 'e19df3dca1c8a1d9f783a6722c56f6ea82189412' * commit 'e19df3dca1c8a1d9f783a6722c56f6ea82189412': When 32-bit offset is used,
| * | | | | am 5c43a7af: Merge "When 32-bit offset is used, if the requested max file ↵James Dong2010-09-091-3/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread Merge commit '5c43a7af7b9530016b922ddec0401ab9199cd595' into gingerbread-plus-aosp * commit '5c43a7af7b9530016b922ddec0401ab9199cd595': When 32-bit offset is used,
| | * | | | Merge "When 32-bit offset is used, if the requested max file size is greater ↵James Dong2010-09-091-3/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread
| | | * | | | When 32-bit offset is used,James Dong2010-09-081-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit. Change-Id: Ie74cbed98469721d4280a0b87491e888948f0046
* | | | | | | Merge "resolved conflicts for merge of ff545380 to master"Gilles Debunne2010-09-091-12/+23
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ resolved conflicts for merge of ff545380 to masterGilles Debunne2010-09-091-12/+23
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | Change-Id: Ida3b6cec13b03d734bb1ba4e31554eb5226da749
| | * | | | | | am ab86b782: Merge "Fix for text selection in horizontally scrolled ↵Gilles Debunne2010-09-091-12/+23
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TextViews." into gingerbread Merge commit 'ab86b782fd2c8c7b1e6b50d30482aa2b8f890e80' into gingerbread-plus-aosp * commit 'ab86b782fd2c8c7b1e6b50d30482aa2b8f890e80': Fix for text selection in horizontally scrolled TextViews.
| | | * | | | | Merge "Fix for text selection in horizontally scrolled TextViews." into ↵Gilles Debunne2010-09-091-12/+23
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | gingerbread
| | | | * | | | Fix for text selection in horizontally scrolled TextViews.Gilles Debunne2010-09-081-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A left padding and scroll was not taken into account in cursor position. Bug http://b/issue?id=2970142 Change-Id: Ie76e8d97f3dd5fe3a750aa82cd4b97c98892cb48
* | | | | | | | Fix the buildRobert Greenwalt2010-09-091-3/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | broken merge resolution. Change-Id: Idf1abef1ef79ddc43b9eaba1e0e523085702e2fe
* | | | | | | am f0eab98c: am a063cd64: Merge "Instead of asserting, publish no tracks if ↵Andreas Huber2010-09-092-40/+41
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an MP3Extractor is used on non-mp3 content." into gingerbread Merge commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3' * commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3': Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
| * | | | | | am a063cd64: Merge "Instead of asserting, publish no tracks if an ↵Andreas Huber2010-09-092-40/+41
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MP3Extractor is used on non-mp3 content." into gingerbread Merge commit 'a063cd6478254bba3290576ae5556abf469d6535' into gingerbread-plus-aosp * commit 'a063cd6478254bba3290576ae5556abf469d6535': Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
| | * | | | | Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on ↵Andreas Huber2010-09-092-40/+41
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | non-mp3 content." into gingerbread
| | | * | | | | Instead of asserting, publish no tracks if an MP3Extractor is used on ↵Andreas Huber2010-09-092-40/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-mp3 content. Change-Id: I26db4524c5306bf2346438d2bd359c5cfb95cead related-to-bug: 2900419
* | | | | | | | Merge "Fix SimUtilsTest after changing in bcdToString."John Wang2010-09-091-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix SimUtilsTest after changing in bcdToString.John Wang2010-09-081-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After changes in IccUtils.bcdToString() to ignore high nibble 'F' (see change #55090), the testBasic() need to be changed accordingly. Change-Id: If52a66b1c80b5d16af5bd3f431284e79012be300
* | | | | | | | | Merge "resolved conflicts for merge of ec52c98d to master"Robert Greenwalt2010-09-096-72/+262
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ resolved conflicts for merge of ec52c98d to masterRobert Greenwalt2010-09-096-72/+262
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | Change-Id: I31297232c9d918a967b93c3ae977f81b6a94f2ed
| | * | | | | | | | am 0727a865: Merge "Add network condition reporting." into gingerbreadRobert Greenwalt2010-09-096-73/+258
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0727a865d83b944c2fecc0bf1228a36976fe5300' into gingerbread-plus-aosp * commit '0727a865d83b944c2fecc0bf1228a36976fe5300': Add network condition reporting.
| | | * | | | | | | Merge "Add network condition reporting." into gingerbreadRobert Greenwalt2010-09-096-73/+258
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | | * | | | | | Add network condition reporting.Robert Greenwalt2010-09-096-73/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps can report if they like their connection to the nets and we display either not-really-connected or fully-connected icons. Final icons TBD. bug:2978624 Change-Id: I28be52085edfe54571c0d4559aba0df883548654
* | | | | | | | | | Merge "Mute some spammy log messages from KeyButtonView"Christopher Tate2010-09-091-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Mute some spammy log messages from KeyButtonViewChristopher Tate2010-09-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a254b6b9d611b3daaa9972a9d26a19c99e8572d
* | | | | | | | | | | Support MBCS characters in contacts and SMS messages that are stored in SIM ↵Sang-il, Lee2010-09-097-3/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cards. Change-Id: I0438c5748a47512fc2a0e4b89ac85e30e3f5c6de
* | | | | | | | | | | Merge "MTP: Fix support for transfering folders and playlists."Mike Lockwood2010-09-091-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | MTP: Fix support for transfering folders and playlists.Mike Lockwood2010-09-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This broke when I added support for transfering arbitrary files. Change-Id: I6f2c052f3bd69839befcf0783d7aff5bcfd29b3e Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | Merge "surfaceflinger: give hwcomposer a chance to release buffers"Erik Gilling2010-09-093-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | surfaceflinger: give hwcomposer a chance to release buffersAntti Hatala2010-09-093-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I605fa779702022865dd58df3b36f37c2644ade36
* | | | | | | | | | | | | Merge "surfaceflinger: composite HWC_SKIP_LAYER layers"Erik Gilling2010-09-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | surfaceflinger: composite HWC_SKIP_LAYER layersAntti Hatala2010-09-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I363ede63287ae903d66d0d419343f4ecd81bcc00
generated by cgit v1.1 at 2025-11-26 18:21:00 +0000