Glenn Kasten
e119bd1442
Merge "Replace run-time stream types by compile-time"
2012-01-19 06:08:12 -08:00
Gilles Debunne
f0d3b7ff72
AOOB in AutoComplete
...
Bug 5749557
Not clear how we can get an AOOB in that case.
tmp will always have the right length, and indeed the stack
trace attached to that bug shows a correct size of 10.
However, there is an index issue when we build the new
completion array. i is not the correct index to use.
Note however that the original buildDropDown method mentioned
is no longer present in the file. I tried to backtrack, but
the use of arraycopy always seemed correct.
Change-Id: Idf749c74b38923b5d18596c8e8f6ea887cc897d6
2012-01-18 18:39:10 -08:00
Jeff Brown
6534c0e054
Merge "Fix issues with reentrant SQLite triggers."
2012-01-18 18:31:06 -08:00
Jeff Brown
a9be4154e8
Fix issues with reentrant SQLite triggers.
...
Modified SQLiteConnection and SQLiteSession to support
reentrant execution of SQLite operations, as might occur
when a custom function is invoked by a trigger.
Bug: 5884809
Change-Id: I253d828b2801bd06b1bbda7caa7da3f040a642bb
2012-01-18 18:29:20 -08:00
Romain Guy
a37a108cfb
Merge "Add basic code required for drawPicture()"
2012-01-18 18:14:27 -08:00
Romain Guy
75582e889d
Add basic code required for drawPicture()
...
Change-Id: Ib9e73cd4b932836d4debe920200f8d1c1861c2d4
2012-01-18 18:13:35 -08:00
Romain Guy
e7bdf2d9d0
Merge "Don't crash on Canvas.drawPicture()"
2012-01-18 18:11:09 -08:00
Romain Guy
84fce187b0
Don't crash on Canvas.drawPicture()
...
Implementation yet to come but prevent app crashes.
Change-Id: I81d6851ebf776a98e13c606bab272a03aec406ee
2012-01-18 18:09:54 -08:00
Romain Guy
4785a6ff8d
Merge "Full support for Canvas.drawPosText"
2012-01-18 18:01:34 -08:00
Romain Guy
671d6cf460
Full support for Canvas.drawPosText
...
This also introduces a small optimization when rendering text.
Change-Id: Iff620ac97bf878eaac406bccc6daa07052c93890
2012-01-18 18:00:12 -08:00
Xavier Ducrohet
5bf2802ad9
Fix broken drawCircle LayoutLib.
...
Change-Id: I5e23bbe0119e385fa2f77854a8f88128351d3759
2012-01-18 17:08:53 -08:00
Eric Laurent
05683c8596
am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
...
* commit 'db2e71635968f455ad4f41b2e24fb8b909c24ca0':
AudioFlinger: mix track only when really ready (2)
2012-01-18 16:08:06 -08:00
Wink Saville
170bfe32ab
am 7b6231a4: am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
...
* commit '7b6231a44e21fbf5b2bc2a5eff2231139ac4088f':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
2012-01-18 16:08:04 -08:00
Christopher Tate
d3f2f59c46
Merge "Fix edge cases leading to backup hanging forever"
2012-01-18 16:07:28 -08:00
Glenn Kasten
a6dafea172
Fix incorrect includes of AudioTrack.h
...
Remove unnecessary includes of AudioTrack.h.
Use forward declaration of class names in preference to #include when possible.
Change-Id: I12982811fa75c2c7695d8bbfa595a7aaec047dc0
2012-01-18 16:06:47 -08:00
Wink Saville
7b6231a44e
am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
...
* commit 'aba798510129327a046d57844381382fb1faa3ba':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
2012-01-18 16:05:43 -08:00
Eric Laurent
db2e716359
Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
2012-01-18 16:05:31 -08:00
Wink Saville
aba7985101
Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
2012-01-18 16:03:24 -08:00
Glenn Kasten
8f397cdd4c
Simplify range check for audio_mode_t (continued)
...
Missed one place in earlier CL of same name
Change-Id: I0dd25364d0b8d5d731c02d352f139a0c8d4df1a8
2012-01-18 15:57:40 -08:00
Teng-Hui Zhu
96fae5e088
Support full screen back to back playing using javascript
...
bug:5766427
Change-Id: I0117e50a3e547ac8c33cf966bef18e6d75f98660
2012-01-18 15:53:01 -08:00
Glenn Kasten
22c4241a13
Add units to time periods
...
Change-Id: Ib980e2676cecf5d9b0c2e388da6dc8e370df8abb
2012-01-18 15:45:55 -08:00
Glenn Kasten
05d331090f
Use const const strings for arrays and pointers to strings
...
Change-Id: I0a073e17ebf6ad59e7edbedac104c6fa4bcaf9c9
2012-01-18 15:44:48 -08:00
Christopher Tate
6de74ff2a4
Fix edge cases leading to backup hanging forever
...
Plug a couple of apparent code paths (one not obviously reachable, but
fixed here on general principles) that could lead to a backup pass
getting confused partway through and simply never properly completing.
In this state it would leave its wakelock held forever until next
reboot. Bug 5828859.
Those fixes are a total of two lines of code. The rest of the patch
adds a textual journal of the most recently completed (or ongoing!)
backup pass's progress, with an eye to being able to isolate any such
issues that may crop up in the future.
Change-Id: If8a5e8aba11db5a1e618d8b9c9ba3038dd5377a1
2012-01-18 15:44:47 -08:00
Glenn Kasten
b737dbb5c4
For booleans, use ! instead of == false
...
Change-Id: Ibc115936d2d0b0b7744ebe9b52839ea5b42c4edd
2012-01-18 15:42:59 -08:00
Stephen Hines
03cbb97e4e
Merge "Run ComputePerf multiple times."
2012-01-18 15:42:46 -08:00
Glenn Kasten
ee7fea9f2f
Remove dead setRingerMode(mode, mask)
...
Change-Id: Ia4cc8be8424a40b3dcb7ebd0264fdff4e5247f7f
2012-01-18 15:10:31 -08:00
Stephen Hines
1f541a0423
Run ComputePerf multiple times.
...
Change-Id: I715c726f15416685b715a14a25c9595d9a9a124b
2012-01-18 15:06:57 -08:00
Adam Powell
ea77ed02e4
am a6a0d134: am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
...
* commit 'a6a0d134ebfb0931473c5e54f21ff543e08b4a91':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
2012-01-18 14:51:35 -08:00
Adam Powell
a6a0d134eb
am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
...
* commit '04f3848986efda8cf006f575d2e4990f120a1bc8':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
2012-01-18 14:49:30 -08:00
Adam Powell
04f3848986
Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
2012-01-18 14:47:20 -08:00
Jeff Brown
2a16b13744
Merge "Improve heuristics for orientation detection."
2012-01-18 14:43:16 -08:00
Gilles Debunne
c171402318
Touch slop added to double tap detection
...
Similar to what is done in GestureDetector
Removed all gesture constants. Only one one them is used on MOVE
(added an early exit test), the 2 others on UP or DOWN where
performance is not such an issue.
Change-Id: Icd58ead5078f94f86786f934ddf81aa5ec9bf549
2012-01-18 14:40:53 -08:00
Michael Kolb
d9fdd9fd78
Merge "Prevent IME from popping up on startup"
2012-01-18 14:00:52 -08:00
Robert Ly
ca917ac1e6
am c891c6ef: am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
...
* commit 'c891c6eff7ab320092af4ec5b235f83866f66261':
docs: adding rs api docs
2012-01-18 13:21:54 -08:00
Robert Ly
b41c96a374
am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
...
* commit '43fda84e91b1fe356af35386d2f304d3ab71529e':
update overview page for rs api docs to open iframe links in parent
2012-01-18 13:21:51 -08:00
Robert Ly
c891c6eff7
am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
...
* commit '013dbcf0783f55efbb75e6c2794478c27d172c8c':
docs: adding rs api docs
2012-01-18 13:19:52 -08:00
Robert Ly
43fda84e91
am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
...
* commit '6ad9ea7deb669eca68c58f001c935255c3294cfe':
update overview page for rs api docs to open iframe links in parent
2012-01-18 13:19:50 -08:00
Robert Ly
013dbcf078
Merge "docs: adding rs api docs" into ics-mr1
2012-01-18 13:18:11 -08:00
Robert Ly
6ad9ea7deb
Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
2012-01-18 13:17:51 -08:00
Martijn Coenen
1ad65e7054
Merge "Remove LlcpPacket from public namespace."
2012-01-18 13:09:55 -08:00
Joe Fernandez
5689317a6f
am 58f9c3da: am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
...
* commit '58f9c3da340eb36051bc20d6b8cec6b982852ee0':
docs: Android API 15 SDK r2 Release Notes
2012-01-18 12:37:22 -08:00
Joe Fernandez
58f9c3da34
am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
...
* commit 'dd41d360eac45ceae92963ed3f100f1c39dd5db2':
docs: Android API 15 SDK r2 Release Notes
2012-01-18 12:35:30 -08:00
Joe Fernandez
dd41d360ea
Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
2012-01-18 12:33:45 -08:00
Eric Laurent
71c4496a97
AudioFlinger: mix track only when really ready (2)
...
This problem due to the way audio buffers are mixed when
low power mode is active was addressed by commits 19ddf0eb
and 8a04fe03 but only partially. As a matter of fact, when more
than one audio track is playing, the problem is still present.
This is most noticeable when playing music with screen off
and a notification or navigation instruction is played: in this case,
the music or notification is likely to skip.
The fix consists in declaring the mixer ready if all active tracks
are ready. Previous behavior was to declare ready if at least one track was
ready. To avoid that one application failing to fill the track buffer blocks other
tracks indefinitely, this condition is respected only if the mixer was ready
in the previous round.
Issue 5799167.
Change-Id: Iabd4ca08d3d45f563d9824c8a03c2c68a43ae179
2012-01-18 12:27:38 -08:00
Michael Kolb
17146c7cc0
Prevent IME from popping up on startup
...
Bug: 5869028
Change-Id: Ie5c7004def16eeac4147d19fb00fc9631a17579e
2012-01-18 11:20:01 -08:00
Andreas Huber
b2d81fead9
Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures"
2012-01-18 11:01:00 -08:00
Andreas Huber
28ea013f25
Temporarily restore AudioSystem/AudioTrack APIs with their former signatures
...
until we get updated prebuilts from vendor.
Change-Id: I8aae81d2513edca0ab268053a11c8c4206879e61
2012-01-18 10:51:55 -08:00
John Reck
955fdda057
Add tapHighlightColor support
...
Change-Id: I419eb3d8f1050efd05bb989a6b353ad45ee77acf
2012-01-18 09:36:43 -08:00
Andreas Huber
70a957cef1
Merge "AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)"
2012-01-18 09:29:56 -08:00
Bryan Mawhinney
f429b6a901
Merge "Make sure seek triggers a reconnect if needed."
2012-01-18 08:58:19 -08:00