OSDN Git Service
Hung-ying Tyan [Tue, 10 Aug 2010 02:52:19 +0000 (19:52 -0700)]
am
d122805b: CallManager: add getAllPhones().
Merge commit '
d122805bbfcb770f941cac259bcefafdb2d3ad56' into gingerbread-plus-aosp
* commit '
d122805bbfcb770f941cac259bcefafdb2d3ad56':
CallManager: add getAllPhones().
Dan Egnor [Sat, 7 Aug 2010 01:59:49 +0000 (18:59 -0700)]
am
799f2bb0: am
b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit '
799f2bb04102b4b692b52eed5c36aea9a8cde471' into gingerbread-plus-aosp
* commit '
799f2bb04102b4b692b52eed5c36aea9a8cde471':
COMMENT ONLY change to fix some formatting glitches and
Dan Egnor [Sat, 7 Aug 2010 01:55:05 +0000 (18:55 -0700)]
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
Andreas Huber [Sat, 7 Aug 2010 01:54:31 +0000 (18:54 -0700)]
am
ad98d383: Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
Merge commit '
ad98d383a04fce08a147b200e23b12f12b2681a3' into gingerbread-plus-aosp
* commit '
ad98d383a04fce08a147b200e23b12f12b2681a3':
Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
Andreas Huber [Sat, 7 Aug 2010 01:54:26 +0000 (18:54 -0700)]
am
261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread
Merge commit '
261aaa16a2f469d7f3d3b56f1a45432460ee4dba' into gingerbread-plus-aosp
* commit '
261aaa16a2f469d7f3d3b56f1a45432460ee4dba':
Properly skip the 'skip' chunk in mpeg4 files.
Steve Howard [Sat, 7 Aug 2010 01:54:22 +0000 (18:54 -0700)]
am
9fbf00cb: Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
Merge commit '
9fbf00cb041eeb22acad93deace9712c57b4c594' into gingerbread-plus-aosp
* commit '
9fbf00cb041eeb22acad93deace9712c57b4c594':
Slight improvement (hopefully) to orientation sensing.
Konstantin Lopyrev [Sat, 7 Aug 2010 01:54:18 +0000 (18:54 -0700)]
am
3b0d3d51: Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread
Merge commit '
3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8' into gingerbread-plus-aosp
* commit '
3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8':
Adding a way for Hierarchy Viewer to get the focused window.
Steve Howard [Sat, 7 Aug 2010 01:54:13 +0000 (18:54 -0700)]
am
db86c59e: New drawables for the update to the maps API (DO NOT MERGE)
Merge commit '
db86c59e6280cb2ebeeda09ba8dee4a1440dea1d' into gingerbread-plus-aosp
* commit '
db86c59e6280cb2ebeeda09ba8dee4a1440dea1d':
New drawables for the update to the maps API (DO NOT MERGE)
Steve Howard [Sat, 7 Aug 2010 01:54:03 +0000 (18:54 -0700)]
am
8e15afe7: Make downloads visible by default.
Merge commit '
8e15afe799bbe8d332640c1f2b57b5e0458a9625' into gingerbread-plus-aosp
* commit '
8e15afe799bbe8d332640c1f2b57b5e0458a9625':
Make downloads visible by default.
Kenny Root [Sat, 7 Aug 2010 01:53:48 +0000 (18:53 -0700)]
am
818490ab: Fix String8::operator+
Merge commit '
818490ab2abe36dfc6c13d01fea5220bd64cca8c' into gingerbread-plus-aosp
* commit '
818490ab2abe36dfc6c13d01fea5220bd64cca8c':
Fix String8::operator+
Dan Egnor [Fri, 6 Aug 2010 23:39:02 +0000 (16:39 -0700)]
Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Andreas Huber [Fri, 6 Aug 2010 22:21:47 +0000 (15:21 -0700)]
Merge "Properly skip the 'skip' chunk in mpeg4 files." into gingerbread
Steve Howard [Fri, 6 Aug 2010 21:28:37 +0000 (14:28 -0700)]
Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
Konstantin Lopyrev [Fri, 6 Aug 2010 21:10:29 +0000 (14:10 -0700)]
Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread
Kenny Root [Thu, 5 Aug 2010 23:21:23 +0000 (16:21 -0700)]
Fix String8::operator+
The LHS was ignored when using:
String8 + String8
String8 + (const char*)
Add unit tests for above.
Bug:
2898473
Change-Id: Ic8fe7be668b665c36aaaa3fc3c3ffdfff0fbba25
Mike Lockwood [Fri, 6 Aug 2010 14:41:44 +0000 (07:41 -0700)]
am
5723dfe8: GPS: Don\'t set XTRA download pending flag at boot time.
Merge commit '
5723dfe8c87d0887b8926f43637ed300466890d2' into gingerbread-plus-aosp
* commit '
5723dfe8c87d0887b8926f43637ed300466890d2':
GPS: Don't set XTRA download pending flag at boot time.
Chia-chi Yeh [Fri, 6 Aug 2010 06:17:23 +0000 (23:17 -0700)]
am
4c5d28ce: RTP: move into frameworks.
Merge commit '
4c5d28cee0537c83ff0e5bc0daaae78f68dfc7c8' into gingerbread-plus-aosp
* commit '
4c5d28cee0537c83ff0e5bc0daaae78f68dfc7c8':
RTP: move into frameworks.
Chung-yih Wang [Fri, 6 Aug 2010 04:10:06 +0000 (21:10 -0700)]
am
1d62c773: Fix the build
Merge commit '
1d62c7737c33f92e79f0a180b05969f52484e64c' into gingerbread-plus-aosp
* commit '
1d62c7737c33f92e79f0a180b05969f52484e64c':
Fix the build
Chung-yih Wang [Fri, 6 Aug 2010 02:38:04 +0000 (19:38 -0700)]
am
b9605886: Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread
Merge commit '
b9605886d1a94de624b6feb5a81bb37f41653437' into gingerbread-plus-aosp
* commit '
b9605886d1a94de624b6feb5a81bb37f41653437':
Revert "Revert "Move SIP telephony related codes to framework.""
Chung-yih Wang [Fri, 6 Aug 2010 02:37:59 +0000 (19:37 -0700)]
am
7324489f: Merge "Add SIP service into system server." into gingerbread
Merge commit '
7324489f18ee01586931f577f00567092cbf52df' into gingerbread-plus-aosp
* commit '
7324489f18ee01586931f577f00567092cbf52df':
Add SIP service into system server.
Chung-yih Wang [Fri, 6 Aug 2010 02:35:54 +0000 (19:35 -0700)]
Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread
Chung-yih Wang [Fri, 6 Aug 2010 02:35:45 +0000 (19:35 -0700)]
Merge "Add SIP service into system server." into gingerbread
Adam Powell [Fri, 6 Aug 2010 01:44:49 +0000 (18:44 -0700)]
am
740aa4b2: 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 '
740aa4b2865a20700254314158bcb685514b2ac2' into gingerbread-plus-aosp
* commit '
740aa4b2865a20700254314158bcb685514b2ac2':
DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
Adam Powell [Fri, 6 Aug 2010 01:39:37 +0000 (18:39 -0700)]
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
Adam Powell [Fri, 6 Aug 2010 01:33:31 +0000 (18:33 -0700)]
Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo
Fred Quintana [Fri, 6 Aug 2010 00:51:28 +0000 (17:51 -0700)]
am
5005a6c0: am
cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo
Merge commit '
5005a6c031b5d66c1b47cad6f0dbaacebcbb6803' into gingerbread-plus-aosp
* commit '
5005a6c031b5d66c1b47cad6f0dbaacebcbb6803':
Changed SyncOperation.toKey() to not rely on the implementation of
Fred Quintana [Fri, 6 Aug 2010 00:42:05 +0000 (17:42 -0700)]
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
Fred Quintana [Fri, 6 Aug 2010 00:36:27 +0000 (17:36 -0700)]
Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo
Vasu Nori [Fri, 6 Aug 2010 00:15:08 +0000 (17:15 -0700)]
am
499b7438: Merge "(gingerbread) remove unused tests. bug:
2898376" into gingerbread
Merge commit '
499b743851aa84b9fc1a7e445e189946bc47ad5d' into gingerbread-plus-aosp
* commit '
499b743851aa84b9fc1a7e445e189946bc47ad5d':
(gingerbread) remove unused tests. bug:
2898376
Vasu Nori [Fri, 6 Aug 2010 00:11:53 +0000 (17:11 -0700)]
Merge "(gingerbread) remove unused tests. bug:
2898376" into gingerbread
Scott Main [Thu, 5 Aug 2010 22:56:13 +0000 (15:56 -0700)]
am
432a2a1b: am
005e2400: Merge "fix xml sample error" into froyo
Merge commit '
432a2a1bc7fb66e604772052f770857c149b2f97' into gingerbread-plus-aosp
* commit '
432a2a1bc7fb66e604772052f770857c149b2f97':
fix xml sample error
Scott Main [Thu, 5 Aug 2010 22:53:04 +0000 (15:53 -0700)]
am
005e2400: Merge "fix xml sample error" into froyo
Merge commit '
005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c' into gingerbread
* commit '
005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c':
fix xml sample error
Scott Main [Thu, 5 Aug 2010 22:49:08 +0000 (15:49 -0700)]
Merge "fix xml sample error" into froyo
Eric Rowe [Thu, 5 Aug 2010 22:18:22 +0000 (15:18 -0700)]
am
f9ea8ec5: am
982f1521: Merge "Checkin initial bluetooth stress tests." into froyo
Merge commit '
f9ea8ec57e1e1d5654f57c22f514954e242833d2' into gingerbread-plus-aosp
* commit '
f9ea8ec57e1e1d5654f57c22f514954e242833d2':
Checkin initial bluetooth stress tests.
James Dong [Thu, 5 Aug 2010 22:18:16 +0000 (15:18 -0700)]
am
1441bdfc: Merge "Use the target color format from the camera source if possible" into gingerbread
Merge commit '
1441bdfc19d6998607adf1347ed8dafc102908c9' into gingerbread-plus-aosp
* commit '
1441bdfc19d6998607adf1347ed8dafc102908c9':
Use the target color format from the camera source if possible
Eric Rowe [Thu, 5 Aug 2010 22:10:15 +0000 (15:10 -0700)]
am
982f1521: Merge "Checkin initial bluetooth stress tests." into froyo
Merge commit '
982f1521a662d274eca1216707d874f148396ac6' into gingerbread
* commit '
982f1521a662d274eca1216707d874f148396ac6':
Checkin initial bluetooth stress tests.
James Dong [Thu, 5 Aug 2010 22:10:03 +0000 (15:10 -0700)]
Merge "Use the target color format from the camera source if possible" into gingerbread
Eric Rowe [Thu, 5 Aug 2010 21:49:22 +0000 (14:49 -0700)]
Merge "Checkin initial bluetooth stress tests." into froyo
James Dong [Thu, 5 Aug 2010 18:06:25 +0000 (11:06 -0700)]
am
3aad8c38: Merge "Fix an issue where the track duration does not include the last sample duration" into gingerbread
Merge commit '
3aad8c38520956708e51882f3fad63a7a217e8e4' into gingerbread-plus-aosp
* commit '
3aad8c38520956708e51882f3fad63a7a217e8e4':
Fix an issue where the track duration does not include the last sample duration
James Dong [Thu, 5 Aug 2010 18:04:14 +0000 (11:04 -0700)]
Merge "Fix an issue where the track duration does not include the last sample duration" into gingerbread
Brian Carlstrom [Thu, 5 Aug 2010 17:40:45 +0000 (10:40 -0700)]
am
4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread
Merge commit '
4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp
* commit '
4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
Tracking merge of dalvik-dev to gingerbread
Brian Carlstrom [Thu, 5 Aug 2010 17:35:53 +0000 (10:35 -0700)]
Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread
Andreas Huber [Thu, 5 Aug 2010 17:13:30 +0000 (10:13 -0700)]
am
2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread
Merge commit '
2c37f3d3a09188f3dc66e177547709e4828918be' into gingerbread-plus-aosp
* commit '
2c37f3d3a09188f3dc66e177547709e4828918be':
Better support for fake timestamps in RTP, H.263 video now also requests FIR.
Andreas Huber [Thu, 5 Aug 2010 17:13:26 +0000 (10:13 -0700)]
am
407ec58c: Merge "A better fix for the OggExtractor referring to the sample rate while it hasn\'t been initialized yet." into gingerbread
Merge commit '
407ec58c6604da3255b04aa99577515deba3a26f' into gingerbread-plus-aosp
* commit '
407ec58c6604da3255b04aa99577515deba3a26f':
A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
Andreas Huber [Thu, 5 Aug 2010 17:11:28 +0000 (10:11 -0700)]
Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread
Andreas Huber [Thu, 5 Aug 2010 17:11:18 +0000 (10:11 -0700)]
Merge "A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet." into gingerbread
Kenny Root [Thu, 5 Aug 2010 17:04:59 +0000 (10:04 -0700)]
am
dec43a10: Merge "Fix up PackageManager tests" into gingerbread
Merge commit '
dec43a102226de55307de20d5779e20a435be8b1' into gingerbread-plus-aosp
* commit '
dec43a102226de55307de20d5779e20a435be8b1':
Fix up PackageManager tests
Kenny Root [Thu, 5 Aug 2010 17:02:30 +0000 (10:02 -0700)]
Merge "Fix up PackageManager tests" into gingerbread
Andreas Huber [Thu, 5 Aug 2010 16:25:25 +0000 (09:25 -0700)]
am
fb861523: Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread
Merge commit '
fb861523318710b95c08110b9b2de28f7da74a40' into gingerbread-plus-aosp
* commit '
fb861523318710b95c08110b9b2de28f7da74a40':
Specification of codec specific data as part of the session description is now optional.
Andreas Huber [Thu, 5 Aug 2010 16:18:38 +0000 (09:18 -0700)]
Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread
Chung-yih Wang [Thu, 5 Aug 2010 05:33:08 +0000 (22:33 -0700)]
am
cde66df4: Revert "Move SIP telephony related codes to framework."
Merge commit '
cde66df44240cfe5a7bec12ac52464c3bf26c14f' into gingerbread-plus-aosp
* commit '
cde66df44240cfe5a7bec12ac52464c3bf26c14f':
Revert "Move SIP telephony related codes to framework."
Chung-yih Wang [Thu, 5 Aug 2010 04:18:57 +0000 (21:18 -0700)]
am
468e35ef: Merge "Move SIP telephony related codes to framework." into gingerbread
Merge commit '
468e35efc595114354eff7ee2685ea79ed098c7f' into gingerbread-plus-aosp
* commit '
468e35efc595114354eff7ee2685ea79ed098c7f':
Move SIP telephony related codes to framework.
Chung-yih Wang [Thu, 5 Aug 2010 04:16:48 +0000 (21:16 -0700)]
Merge "Move SIP telephony related codes to framework." into gingerbread
Daniel Sandler [Thu, 5 Aug 2010 03:36:09 +0000 (20:36 -0700)]
am
9b87770f: Merge "Fix crash when startForeground posts a broken Notification." into gingerbread
Merge commit '
9b87770f53c55a313a7fdc6f553265aabbde3446' into gingerbread-plus-aosp
* commit '
9b87770f53c55a313a7fdc6f553265aabbde3446':
Fix crash when startForeground posts a broken Notification.
Daniel Sandler [Thu, 5 Aug 2010 03:33:32 +0000 (20:33 -0700)]
Merge "Fix crash when startForeground posts a broken Notification." into gingerbread
Chung-yih Wang [Thu, 5 Aug 2010 02:30:37 +0000 (19:30 -0700)]
am
8c503569: Merge "Move the sip related codes to framework." into gingerbread
Merge commit '
8c5035696b0aaf30ae49594b845f663fe633ac88' into gingerbread-plus-aosp
* commit '
8c5035696b0aaf30ae49594b845f663fe633ac88':
Move the sip related codes to framework.
Chung-yih Wang [Thu, 5 Aug 2010 02:28:23 +0000 (19:28 -0700)]
Merge "Move the sip related codes to framework." into gingerbread
John Wang [Thu, 5 Aug 2010 01:56:37 +0000 (18:56 -0700)]
am
62f066a1: Merge "Add register methods in CallManager "do not merge"" into gingerbread
Merge commit '
62f066a14afb2774569a54c150a9d0a2601dd77a' into gingerbread-plus-aosp
* commit '
62f066a14afb2774569a54c150a9d0a2601dd77a':
Add register methods in CallManager "do not merge"
John Wang [Thu, 5 Aug 2010 01:54:55 +0000 (18:54 -0700)]
Merge "Add register methods in CallManager "do not merge"" into gingerbread
Scott Main [Thu, 5 Aug 2010 01:05:26 +0000 (18:05 -0700)]
am
97c2d840: am
8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class
Merge commit '
97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp
* commit '
97c2d840a10813164d82571775a3566637d6c5de':
fix some doc errors in the resources;
Scott Main [Thu, 5 Aug 2010 01:05:22 +0000 (18:05 -0700)]
Scott Main [Thu, 5 Aug 2010 01:02:25 +0000 (18:02 -0700)]
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;
Scott Main [Thu, 5 Aug 2010 01:02:18 +0000 (18:02 -0700)]
Kenny Root [Thu, 5 Aug 2010 00:04:29 +0000 (17:04 -0700)]
am
2d817f75: Free scanBuf in ZipFileRO
Merge commit '
2d817f75969cf3942ae3bcb9d194b9c095288dc7' into gingerbread-plus-aosp
* commit '
2d817f75969cf3942ae3bcb9d194b9c095288dc7':
Free scanBuf in ZipFileRO
Kenny Root [Wed, 4 Aug 2010 23:30:40 +0000 (16:30 -0700)]
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
Marco Nelissen [Wed, 4 Aug 2010 22:39:55 +0000 (15:39 -0700)]
am
7d146197: Merge "Fix divide by zero." into gingerbread
Merge commit '
7d146197873e9bd5c1618a4ae10bcd13c821e1ce' into gingerbread-plus-aosp
* commit '
7d146197873e9bd5c1618a4ae10bcd13c821e1ce':
Fix divide by zero.
Marco Nelissen [Wed, 4 Aug 2010 22:37:37 +0000 (15:37 -0700)]
Merge "Fix divide by zero." into gingerbread
Kenny Root [Wed, 4 Aug 2010 22:03:56 +0000 (15:03 -0700)]
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
Kenny Root [Wed, 4 Aug 2010 22:01:56 +0000 (15:01 -0700)]
Merge "Failure to move .dex in eng builds is not fatal" into gingerbread
jsh [Wed, 4 Aug 2010 21:35:44 +0000 (14:35 -0700)]
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.
jsh [Wed, 4 Aug 2010 21:32:19 +0000 (14:32 -0700)]
Merge "Add support for PSC of serving cell." into gingerbread
Andreas Huber [Wed, 4 Aug 2010 21:18:58 +0000 (14:18 -0700)]
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.
Andreas Huber [Wed, 4 Aug 2010 21:16:20 +0000 (14:16 -0700)]
Merge "Don't return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread
Andreas Huber [Wed, 4 Aug 2010 21:15:23 +0000 (14:15 -0700)]
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.
Kenny Root [Wed, 4 Aug 2010 21:12:52 +0000 (14:12 -0700)]
am
50871525: Add more debugging to installd
Merge commit '
508715259c332613240b2399c77d35ea7214f91a' into gingerbread-plus-aosp
* commit '
508715259c332613240b2399c77d35ea7214f91a':
Add more debugging to installd
Andreas Huber [Wed, 4 Aug 2010 21:06:12 +0000 (14:06 -0700)]
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
Jaikumar Ganesh [Wed, 4 Aug 2010 18:36:03 +0000 (11:36 -0700)]
am
737998f5: Merge "Add Blocked Device property." into gingerbread
Merge commit '
737998f5955aa14f1b21967f6f559bca60cb1844' into gingerbread-plus-aosp
* commit '
737998f5955aa14f1b21967f6f559bca60cb1844':
Add Blocked Device property.
Jaikumar Ganesh [Wed, 4 Aug 2010 18:28:55 +0000 (11:28 -0700)]
Merge "Add Blocked Device property." into gingerbread
Eric Fischer [Wed, 4 Aug 2010 17:43:27 +0000 (10:43 -0700)]
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
Eric Fischer [Wed, 4 Aug 2010 17:40:36 +0000 (10:40 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Laurent [Wed, 4 Aug 2010 17:07:24 +0000 (10:07 -0700)]
am
7629e8dd: Merge "Fix issue
2876124." into gingerbread
Merge commit '
7629e8dd1426a8a8e38a82e13eb51d1c6af24f36' into gingerbread-plus-aosp
* commit '
7629e8dd1426a8a8e38a82e13eb51d1c6af24f36':
Fix issue
2876124.
Eric Laurent [Wed, 4 Aug 2010 17:03:36 +0000 (10:03 -0700)]
Merge "Fix issue
2876124." into gingerbread
Marco Nelissen [Wed, 4 Aug 2010 16:24:52 +0000 (09:24 -0700)]
am
c6ecccb2: Merge "Fix the build." into gingerbread
Merge commit '
c6ecccb284401b6312108f927ffcfc303872f380' into gingerbread-plus-aosp
* commit '
c6ecccb284401b6312108f927ffcfc303872f380':
Fix the build.
Marco Nelissen [Wed, 4 Aug 2010 16:22:31 +0000 (09:22 -0700)]
Merge "Fix the build." into gingerbread
Kenny Root [Wed, 4 Aug 2010 16:18:27 +0000 (09:18 -0700)]
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
Kenny Root [Wed, 4 Aug 2010 16:15:48 +0000 (09:15 -0700)]
Merge "Only allow one movePackage operation in-flight" into gingerbread
Eric Laurent [Wed, 4 Aug 2010 15:52:27 +0000 (08:52 -0700)]
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.
Eric Laurent [Wed, 4 Aug 2010 15:42:37 +0000 (08:42 -0700)]
Merge "NEW_API: Unhide audio effect APIs." into gingerbread
Brad Fitzpatrick [Wed, 4 Aug 2010 00:00:20 +0000 (17:00 -0700)]
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.
Brad Fitzpatrick [Tue, 3 Aug 2010 23:57:47 +0000 (16:57 -0700)]
Merge "Usage Stats: don't block writing stats to disk." into gingerbread
Brett Chabot [Tue, 3 Aug 2010 23:04:03 +0000 (16:04 -0700)]
am
c458b2ca: Merge "Frameworks core tests size cleanup." into gingerbread
Merge commit '
c458b2cab3a67e84f768af2247ba5235003a4ce4' into gingerbread-plus-aosp
* commit '
c458b2cab3a67e84f768af2247ba5235003a4ce4':
Frameworks core tests size cleanup.
Brett Chabot [Tue, 3 Aug 2010 23:02:09 +0000 (16:02 -0700)]
Merge "Frameworks core tests size cleanup." into gingerbread
James Dong [Tue, 3 Aug 2010 22:57:26 +0000 (15:57 -0700)]
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
James Dong [Tue, 3 Aug 2010 22:54:32 +0000 (15:54 -0700)]
Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
Chris Tate [Tue, 3 Aug 2010 19:25:29 +0000 (12:25 -0700)]
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.
Chris Tate [Tue, 3 Aug 2010 19:22:50 +0000 (12:22 -0700)]
Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread
Mathias Agopian [Tue, 3 Aug 2010 18:30:42 +0000 (11:30 -0700)]
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
Mathias Agopian [Tue, 3 Aug 2010 18:29:15 +0000 (11:29 -0700)]
Merge "fix [
2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread
Konstantin Lopyrev [Tue, 3 Aug 2010 18:26:25 +0000 (11:26 -0700)]
am
6fcf3a51: Merge "Improving profiling of views." into gingerbread
Merge commit '
6fcf3a518526d4f844830735ca1a2ae82a7500d8' into gingerbread-plus-aosp
* commit '
6fcf3a518526d4f844830735ca1a2ae82a7500d8':
Improving profiling of views.
Konstantin Lopyrev [Tue, 3 Aug 2010 18:26:21 +0000 (11:26 -0700)]
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.