Scott Main
4151093a2e
am 769f9b89: am 5b86de94: fix doc bugs
...
Merge commit '769f9b8980a774e3493cbd9beac565c6b5d62161' into gingerbread-plus-aosp
* commit '769f9b8980a774e3493cbd9beac565c6b5d62161':
fix doc bugs
2010-08-04 18:05:22 -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
ddf215280d
am 2d817f75: Free scanBuf in ZipFileRO
...
Merge commit '2d817f75969cf3942ae3bcb9d194b9c095288dc7' into gingerbread-plus-aosp
* commit '2d817f75969cf3942ae3bcb9d194b9c095288dc7':
Free scanBuf in ZipFileRO
2010-08-04 17:04:29 -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
9c3d163b67
am 7d146197: Merge "Fix divide by zero." into gingerbread
...
Merge commit '7d146197873e9bd5c1618a4ae10bcd13c821e1ce' into gingerbread-plus-aosp
* commit '7d146197873e9bd5c1618a4ae10bcd13c821e1ce':
Fix divide by zero.
2010-08-04 15:39:55 -07:00
Marco Nelissen
996ad778a2
Merge "Fix divide by zero." into gingerbread
2010-08-04 15:37:37 -07:00
Kenny Root
ef0f8760ef
am 125816a2: Merge "Failure to move .dex in eng builds is not fatal" into gingerbread
...
Merge commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0' into gingerbread-plus-aosp
* commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0':
Failure to move .dex in eng builds is not fatal
2010-08-04 15:03:56 -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
5050148024
am 82cadee3: Merge "Add support for PSC of serving cell." into gingerbread
...
Merge commit '82cadee3ca830315c617dfdbf3a8eef207c58436' into gingerbread-plus-aosp
* commit '82cadee3ca830315c617dfdbf3a8eef207c58436':
Add support for PSC of serving cell.
2010-08-04 14:35:44 -07:00
jsh
bc16ba64ab
Merge "Add support for PSC of serving cell." into gingerbread
2010-08-04 14:32:19 -07:00
Andreas Huber
a28e1e8d78
am 86d2c088: Merge "Don\'t return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread
...
Merge commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c' into gingerbread-plus-aosp
* commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c':
Don't return a decoder error if the encoded stream does not start with SPS/PPS.
2010-08-04 14:18:58 -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
18822aa0c1
am c17f35dd: 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
...
Merge commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444' into gingerbread-plus-aosp
* commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444':
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.
2010-08-04 14:15:23 -07:00
Kenny Root
ba1b3fa456
am 50871525: Add more debugging to installd
...
Merge commit '508715259c332613240b2399c77d35ea7214f91a' into gingerbread-plus-aosp
* commit '508715259c332613240b2399c77d35ea7214f91a':
Add more debugging to installd
2010-08-04 14:12:52 -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
fbf99d0cb9
am 737998f5: Merge "Add Blocked Device property." into gingerbread
...
Merge commit '737998f5955aa14f1b21967f6f559bca60cb1844' into gingerbread-plus-aosp
* commit '737998f5955aa14f1b21967f6f559bca60cb1844':
Add Blocked Device property.
2010-08-04 11:36:03 -07:00
Jaikumar Ganesh
78f1ec9186
Merge "Add Blocked Device property." into gingerbread
2010-08-04 11:28:55 -07:00
Eric Fischer
b59489aa34
am d89443d8: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
Merge commit 'd89443d86603dbc9e02e1db32b9071780b4702bc' into gingerbread-plus-aosp
* commit 'd89443d86603dbc9e02e1db32b9071780b4702bc':
Import revised translations. DO NOT MERGE
2010-08-04 10:43:27 -07:00
Eric Fischer
597824ef3a
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-08-04 10:40:36 -07:00
Eric Laurent
fd75a3e4d3
am 7629e8dd: Merge "Fix issue 2876124." into gingerbread
...
Merge commit '7629e8dd1426a8a8e38a82e13eb51d1c6af24f36' into gingerbread-plus-aosp
* commit '7629e8dd1426a8a8e38a82e13eb51d1c6af24f36':
Fix issue 2876124.
2010-08-04 10:07:24 -07:00
Eric Laurent
1f45355466
Merge "Fix issue 2876124." into gingerbread
2010-08-04 10:03:36 -07:00
Marco Nelissen
e1ae94c4a7
am c6ecccb2: Merge "Fix the build." into gingerbread
...
Merge commit 'c6ecccb284401b6312108f927ffcfc303872f380' into gingerbread-plus-aosp
* commit 'c6ecccb284401b6312108f927ffcfc303872f380':
Fix the build.
2010-08-04 09:24:52 -07:00
Marco Nelissen
cfccfc26ff
Merge "Fix the build." into gingerbread
2010-08-04 09:22:31 -07:00
Kenny Root
f15845211b
am c68bcc32: Merge "Only allow one movePackage operation in-flight" into gingerbread
...
Merge commit 'c68bcc320522abf856211e9aa00bba71ccaddacb' into gingerbread-plus-aosp
* commit 'c68bcc320522abf856211e9aa00bba71ccaddacb':
Only allow one movePackage operation in-flight
2010-08-04 09:18:27 -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
87507f512d
am 1340ee8a: Merge "NEW_API: Unhide audio effect APIs." into gingerbread
...
Merge commit '1340ee8a273a9b25a779f3b18d6f832ce496c68e' into gingerbread-plus-aosp
* commit '1340ee8a273a9b25a779f3b18d6f832ce496c68e':
NEW_API: Unhide audio effect APIs.
2010-08-04 08:52:27 -07:00
Eric Laurent
d915ec99f4
Merge "NEW_API: Unhide audio effect APIs." into gingerbread
2010-08-04 08:42:37 -07:00
Brad Fitzpatrick
313311391c
am 866362fc: Merge "Usage Stats: don\'t block writing stats to disk." into gingerbread
...
Merge commit '866362fcb4db93584143c21934ea355cbf9e0757' into gingerbread-plus-aosp
* commit '866362fcb4db93584143c21934ea355cbf9e0757':
Usage Stats: don't block writing stats to disk.
2010-08-03 17:00:20 -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
f36edbf46b
am c458b2ca: Merge "Frameworks core tests size cleanup." into gingerbread
...
Merge commit 'c458b2cab3a67e84f768af2247ba5235003a4ce4' into gingerbread-plus-aosp
* commit 'c458b2cab3a67e84f768af2247ba5235003a4ce4':
Frameworks core tests size cleanup.
2010-08-03 16:04:03 -07:00
Brett Chabot
64587ba1a1
Merge "Frameworks core tests size cleanup." into gingerbread
2010-08-03 16:02:09 -07:00
James Dong
b9ad669761
am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
...
Merge commit 'd194f3d68188a0993617ba8cc29d8abd381b6069' into gingerbread-plus-aosp
* commit 'd194f3d68188a0993617ba8cc29d8abd381b6069':
Replace CHECK with a failure return value when mCamera->setParameters() fails
2010-08-03 15:57:26 -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
5e3c016fb9
am 5d46ce24: Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread
...
Merge commit '5d46ce24cc46dc57d31f809302af916999114ced' into gingerbread-plus-aosp
* commit '5d46ce24cc46dc57d31f809302af916999114ced':
Enhanced VelocityTracker for > 5 pointers and fixed bugs.
2010-08-03 12:25:29 -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
574a26fa52
am 9abce39a: Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread
...
Merge commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f' into gingerbread-plus-aosp
* commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f':
fix [2421247] implement eglGetProcAddress(), needed in the ndk
2010-08-03 11:30:42 -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
a537fcb653
am 6fcf3a51: Merge "Improving profiling of views." into gingerbread
...
Merge commit '6fcf3a518526d4f844830735ca1a2ae82a7500d8' into gingerbread-plus-aosp
* commit '6fcf3a518526d4f844830735ca1a2ae82a7500d8':
Improving profiling of views.
2010-08-03 11:26:25 -07:00
Konstantin Lopyrev
92cb9ba930
am 321f7fad: Making sure that there is no notification when focus changes from something to nothing.
...
Merge commit '321f7fad5c4a6ef27e944dc72e2ddbfb61af81de' into gingerbread-plus-aosp
* commit '321f7fad5c4a6ef27e944dc72e2ddbfb61af81de':
Making sure that there is no notification when focus changes from something to nothing.
2010-08-03 11:26:21 -07:00
Konstantin Lopyrev
5541117c6e
Merge "Improving profiling of views." into gingerbread
2010-08-03 11:24:23 -07:00
James Dong
4bd9ffb445
am 3d84280c: Merge "File writer has a designated writer thread now" into gingerbread
...
Merge commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33' into gingerbread-plus-aosp
* commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33':
File writer has a designated writer thread now
2010-08-03 10:37:32 -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
d5e854edcf
am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
...
Merge commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668' into gingerbread-plus-aosp
* commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668':
Fixed a typo in a method name of MediaPlayerPerformance.java class
2010-08-03 10:10:31 -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
7744d40e3e
am 23796e3b: Merge "Add lost frame handling in AudioSource" into gingerbread
...
Merge commit '23796e3b622c6be4feb15d4d57e58645acfa431b' into gingerbread-plus-aosp
* commit '23796e3b622c6be4feb15d4d57e58645acfa431b':
Add lost frame handling in AudioSource
2010-08-02 18:15:48 -07:00
James Dong
8535375e2e
Merge "Add lost frame handling in AudioSource" into gingerbread
2010-08-02 18:13:54 -07:00
Scott Main
8d4f3200ee
am f2d16bc5: am 5aa4680e: update device dashboard
...
Merge commit 'f2d16bc595fec67e1fe08c341abb9ec2e776aafb' into gingerbread-plus-aosp
* commit 'f2d16bc595fec67e1fe08c341abb9ec2e776aafb':
update device dashboard
2010-08-02 17:45:05 -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
8c93917209
am 14805b6c: Merge "New secure setting for mobile download size limit." into gingerbread
...
Merge commit '14805b6c1ff0fe5324d05ba1dd5053cdf61459b7' into gingerbread-plus-aosp
* commit '14805b6c1ff0fe5324d05ba1dd5053cdf61459b7':
New secure setting for mobile download size limit.
2010-08-02 16:51:52 -07:00