Dianne Hackborn
76263ffc88
Merge "More native work." into gingerbread
2010-08-11 00:45:44 -07:00
Dianne Hackborn
c3ef3ae552
More native work.
...
Implement save/restore of state, and add native APIs for
configuration information.
Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
2010-08-11 00:29:59 -07:00
Hung-ying Tyan
5736292a1a
Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread
2010-08-10 20:48:18 -07:00
Yu Shan Emily Lau
44582306d2
Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread
2010-08-10 20:06:39 -07:00
Adam Powell
b351b3d6ac
Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067 " into gingerbread
2010-08-10 17:52:15 -07:00
Konstantin Lopyrev
336b9815ce
Merge "Categorizing exported view properties." into gingerbread
2010-08-10 17:48:27 -07:00
Jeff Brown
8d4dfd25f7
Fix safe mode and KeyEvent.getMaxKeyCode().
...
Bug: 2901731
Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
2010-08-10 16:28:03 -07:00
Jeff Brown
81a5c091ca
Merge "Optimize VelocityTracker to run in linear time." into gingerbread
2010-08-10 16:26:56 -07:00
Andreas Huber
d74731ce8d
Merge "Remove some obsolete code." into gingerbread
2010-08-10 14:09:39 -07:00
Mathias Agopian
4b149a598f
Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread
2010-08-10 13:50:22 -07:00
James Dong
166638b737
Merge "Add input buffer size check for software video encoders" into gingerbread
2010-08-10 13:27:09 -07:00
Andreas Huber
dd05839d2d
Merge "We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
2010-08-10 12:59:27 -07:00
Eric Fischer
ca71562968
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-08-10 11:54:24 -07:00
Eric Rowe
16f0555ca3
am 301c437b: Remove @LargeTest annotations
...
Merge commit '301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread
* commit '301c437b554e2152f3f6fffadc680f5cbf8e8231':
Remove @LargeTest annotations
2010-08-10 11:53:59 -07:00
Andreas Huber
73310bca96
Merge "Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread
2010-08-10 11:39:38 -07:00
James Dong
c4d25e70d6
Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread
2010-08-10 10:41:29 -07:00
Brett Chabot
c3e4612796
Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread
2010-08-10 10:27:48 -07:00
Hung-ying Tyan
576b36e360
Merge "SIP: clean up unused class and fields." into gingerbread
2010-08-09 22:30:58 -07:00
Mathias Agopian
7f781d1552
improve a bit the implementation of eglGetProcAddress
...
Change-Id: Ie07f33ae2162830df1e4f3d3b5e00fcfb8c350d6
2010-08-09 18:35:43 -07:00
Jaikumar Ganesh
b5a3d0a150
Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread
2010-08-09 17:30:25 -07:00
Konstantin Lopyrev
a06eec8660
Merge "Fix focus notification" into gingerbread
2010-08-09 17:03:10 -07:00
Konstantin Lopyrev
cbceb6f2f2
Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread
2010-08-09 17:02:39 -07:00
Jean-Michel Trivi
c2fab76f69
Merge "Fix bug 2684341 Don't steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread
2010-08-09 14:19:08 -07:00
Jaikumar Ganesh
4d021abf6c
Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread
2010-08-09 13:50:28 -07:00
James Dong
f13b68e556
Merge "Support multiple PPS and SPS in avcC box" into gingerbread
2010-08-09 13:35:54 -07:00
Andreas Huber
daae89bc67
Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread
2010-08-09 11:30:34 -07:00
Eric Laurent
df60362e87
Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread
2010-08-09 10:42:27 -07:00
Dan Egnor
6f678531b9
am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
...
Merge commit 'b37bca9e79489a1abd848ce762bb7d87203b3414' into gingerbread
* commit 'b37bca9e79489a1abd848ce762bb7d87203b3414':
COMMENT ONLY change to fix some formatting glitches and
2010-08-06 18:55:05 -07:00
Dan Egnor
df78a0982c
Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
2010-08-06 16:39:02 -07:00
Andreas Huber
ce4a755725
Merge "Properly skip the 'skip' chunk in mpeg4 files." into gingerbread
2010-08-06 15:21:47 -07:00
Steve Howard
4a32a42290
Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
2010-08-06 14:28:37 -07:00
Konstantin Lopyrev
a96dc98b46
Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread
2010-08-06 14:10:29 -07:00
Kenny Root
aa966638b9
Fix String8::operator+
...
The LHS was ignored when using:
String8 + String8
String8 + (const char*)
Add unit tests for above.
Bug: 2898473
Change-Id: Ic8fe7be668b665c36aaaa3fc3c3ffdfff0fbba25
2010-08-06 09:00:10 -07:00
Chung-yih Wang
9dcf6cf541
Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread
2010-08-05 19:35:54 -07:00
Chung-yih Wang
16458c8ee7
Merge "Add SIP service into system server." into gingerbread
2010-08-05 19:35:45 -07:00
Adam Powell
63e0b0d647
am 90937179: (-s ours) Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo
...
Merge commit '9093717985095913934c079abfa879049bd33ba5' into gingerbread
* commit '9093717985095913934c079abfa879049bd33ba5':
DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
2010-08-05 18:39:37 -07:00
Adam Powell
2ce397899c
Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo
2010-08-05 18:33:31 -07:00
Fred Quintana
6b5cdc76df
am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo
...
Merge commit 'cdf16787fc1234b7f21a9cddc6f8a27b4056bc39' into gingerbread
* commit 'cdf16787fc1234b7f21a9cddc6f8a27b4056bc39':
Changed SyncOperation.toKey() to not rely on the implementation of
2010-08-05 17:42:05 -07:00
Fred Quintana
3e56d0b4a8
Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo
2010-08-05 17:36:27 -07:00
Vasu Nori
9cd0c539f3
Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread
2010-08-05 17:11:53 -07:00
Scott Main
1f1dfc8936
am 005e2400: Merge "fix xml sample error" into froyo
...
Merge commit '005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c' into gingerbread
* commit '005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c':
fix xml sample error
2010-08-05 15:53:04 -07:00
Scott Main
6180fa278e
Merge "fix xml sample error" into froyo
2010-08-05 15:49:08 -07:00
Eric Rowe
9aee656691
am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo
...
Merge commit '982f1521a662d274eca1216707d874f148396ac6' into gingerbread
* commit '982f1521a662d274eca1216707d874f148396ac6':
Checkin initial bluetooth stress tests.
2010-08-05 15:10:15 -07:00
James Dong
b8578072b2
Merge "Use the target color format from the camera source if possible" into gingerbread
2010-08-05 15:10:03 -07:00
Eric Rowe
5df494e1df
Merge "Checkin initial bluetooth stress tests." into froyo
2010-08-05 14:49:22 -07:00
James Dong
82d341ebb4
Merge "Fix an issue where the track duration does not include the last sample duration" into gingerbread
2010-08-05 11:04:14 -07:00
Brian Carlstrom
f62a2a12fb
Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread
2010-08-05 10:35:53 -07:00
Andreas Huber
0f77bbece9
Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread
2010-08-05 10:11:28 -07:00
Andreas Huber
1c9711eb67
Merge "A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet." into gingerbread
2010-08-05 10:11:18 -07:00
Kenny Root
b536767ab1
Merge "Fix up PackageManager tests" into gingerbread
2010-08-05 10:02:30 -07:00
