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
Andreas Huber
3ca9110ff1
Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread
2010-08-05 09:18:38 -07:00
Chung-yih Wang
ddb37ad00e
Merge "Move SIP telephony related codes to framework." into gingerbread
2010-08-04 21:16:48 -07:00
Daniel Sandler
d925cc553e
Merge "Fix crash when startForeground posts a broken Notification." into gingerbread
2010-08-04 20:33:32 -07:00
Chung-yih Wang
5072094ab5
Merge "Move the sip related codes to framework." into gingerbread
2010-08-04 19:28:23 -07:00
John Wang
9785da69cb
Merge "Add register methods in CallManager "do not merge"" into gingerbread
2010-08-04 18:54:55 -07:00
Scott Main
9b45f9f372
am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class
...
Merge commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41' into gingerbread
* commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41':
fix some doc errors in the resources;
2010-08-04 18:02:25 -07:00
Scott Main
3e703d7eb7
am 5b86de94: fix doc bugs
...
Merge commit '5b86de94a163ce4c52ab08a9820f9d78414e1767' into gingerbread
* commit '5b86de94a163ce4c52ab08a9820f9d78414e1767':
fix doc bugs
2010-08-04 18:02:18 -07:00
Kenny Root
8f20e5e540
Free scanBuf in ZipFileRO
...
In the success case, the 65kB scanBuf was not freed!
Also, get rid of annoying complaints about ssize_t from printf in error
cases.
Change-Id: If154ac19bf47637f898b4ec8c8e27c9a073a7b81
2010-08-04 16:53:56 -07:00
Marco Nelissen
996ad778a2
Merge "Fix divide by zero." into gingerbread
2010-08-04 15:37:37 -07:00
Kenny Root
c10d3b9496
Merge "Failure to move .dex in eng builds is not fatal" into gingerbread
2010-08-04 15:01:56 -07:00
jsh
bc16ba64ab
Merge "Add support for PSC of serving cell." into gingerbread
2010-08-04 14:32:19 -07:00
Andreas Huber
890a89a6d8
Merge "Don't return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread
2010-08-04 14:16:20 -07:00
Andreas Huber
71f8931bdd
Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread
2010-08-04 14:06:12 -07:00
Jaikumar Ganesh
78f1ec9186
Merge "Add Blocked Device property." into gingerbread
2010-08-04 11:28:55 -07:00
Eric Fischer
597824ef3a
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-08-04 10:40:36 -07:00
Eric Laurent
1f45355466
Merge "Fix issue 2876124." into gingerbread
2010-08-04 10:03:36 -07:00
Marco Nelissen
cfccfc26ff
Merge "Fix the build." into gingerbread
2010-08-04 09:22:31 -07:00
Kenny Root
804cf1088b
Merge "Only allow one movePackage operation in-flight" into gingerbread
2010-08-04 09:15:48 -07:00
Eric Laurent
d915ec99f4
Merge "NEW_API: Unhide audio effect APIs." into gingerbread
2010-08-04 08:42:37 -07:00
Brad Fitzpatrick
e924f17c24
Merge "Usage Stats: don't block writing stats to disk." into gingerbread
2010-08-03 16:57:47 -07:00
Brett Chabot
64587ba1a1
Merge "Frameworks core tests size cleanup." into gingerbread
2010-08-03 16:02:09 -07:00
James Dong
d667ac1d28
Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
2010-08-03 15:54:32 -07:00
Chris Tate
eaeb35098e
Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread
2010-08-03 12:22:50 -07:00
Mathias Agopian
f4c9140784
Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread
2010-08-03 11:29:15 -07:00
Konstantin Lopyrev
5541117c6e
Merge "Improving profiling of views." into gingerbread
2010-08-03 11:24:23 -07:00
James Dong
c59e3d21c8
Merge "File writer has a designated writer thread now" into gingerbread
2010-08-03 10:35:55 -07:00
James Dong
902e2d3d1a
Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
2010-08-03 09:59:11 -07:00
Mathias Agopian
24035338ed
fix [2421247] implement eglGetProcAddress(), needed in the ndk
...
Change-Id: I5027a27b43c0dd449a404024087853ca05bb8e4e
2010-08-02 18:23:36 -07:00
