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
James Dong
8535375e2e
Merge "Add lost frame handling in AudioSource" into gingerbread
2010-08-02 18:13:54 -07:00
Scott Main
5e11d7ad9f
am 5aa4680e: update device dashboard
...
Merge commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d' into gingerbread
* commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d':
update device dashboard
2010-08-02 17:42:11 -07:00
Steve Howard
c56eae725e
Merge "New secure setting for mobile download size limit." into gingerbread
2010-08-02 16:49:22 -07:00
John Wang
156abdaf99
Merge changes Ic30e2801,I387bab4d into gingerbread
...
* changes:
Handle call list in CallManager "do not merge".
Create CallManager class "do not merge"
2010-08-02 15:31:37 -07:00
Christopher Tate
47890f3257
Merge "Mute a common-case progress log about input injection" into gingerbread
2010-08-02 15:14:44 -07:00
Kenny Root
2a4e1249de
Merge "Do not deference before null check" into gingerbread
2010-08-02 12:33:40 -07:00
Wink Saville
10375734e1
am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
...
Merge commit 'c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread
* commit 'c69f5be0ed3529564e5db6874de52775c2c99007':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
2010-08-02 12:02:42 -07:00
Scott Main
aa57958f88
am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo
...
Merge commit '9cd797902ec8404c5958214fc078d75e87248bf3' into gingerbread
* commit '9cd797902ec8404c5958214fc078d75e87248bf3':
Doc change: Add nexus one to dev phones.
2010-08-02 09:23:50 -07:00
Scott Main
1cf67def06
Merge "Doc change: Add nexus one to dev phones." into froyo
2010-08-02 09:16:30 -07:00
Jeff Brown
b183fbd646
Enhanced VelocityTracker for > 5 pointers and fixed bugs.
...
Improved PointerLocation tool to use VelocityTracker more efficiently
and correctly when multiple pointers are down.
Fixed a bug in TouchInputMapper where it was not correctly copying
the id to index map in the last touch data. This could cause strange
behavior on secondary pointer up events.
Also added finished callback pooling in InputQueue.
Change-Id: Ia85e52ac2fb7350960ea1d7edfbe81a1b3e8267b
2010-07-30 20:08:29 -07:00
Dianne Hackborn
64a74f6537
Merge "Make the systemui process persistent." into gingerbread
2010-07-30 19:10:01 -07:00
Mathias Agopian
3efd03a3c2
Merge "remove copybit hack from software opengl (libagl)" into gingerbread
2010-07-30 18:01:25 -07:00
Dirk Dougherty
6e6cc2014f
am 2ff1ba01: Doc change: Cleanup for licensing doc.
...
Merge commit '2ff1ba012c59169c9719cfab4516b9149414380b' into gingerbread
* commit '2ff1ba012c59169c9719cfab4516b9149414380b':
Doc change: Cleanup for licensing doc.
2010-07-30 17:37:39 -07:00
Kenny Root
20f352905f
Merge "Only install after MCS success" into gingerbread
2010-07-30 16:55:37 -07:00
Brad Fitzpatrick
36b022e7c2
Merge "StrictMode: time violations in Binder calls" into gingerbread
2010-07-30 15:20:28 -07:00
James Dong
6c9c4ea978
Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
2010-07-30 14:49:23 -07:00
Jeff Brown
68e491d5da
Merge "Improve thread safety of input mappers." into gingerbread
2010-07-30 14:48:25 -07:00
Jeff Brown
b51719b9ae
Improve thread safety of input mappers.
...
Also fixed bug where old touch screen size could be reported by
getMotionRange if an orientation change occurred but the user has not
yet touched the screen.
Bug: 2877345
Change-Id: I7878f47458f310ed6ebe6a5d1b2c9bec2c598ab9
2010-07-30 14:43:58 -07:00
James Dong
1ec47739f6
Merge "Lower the lower bound for max file duration check" into gingerbread
2010-07-30 14:28:26 -07:00
