25319 Commits

Author SHA1 Message Date
Andreas Huber
c6d1519e54 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.
2010-08-05 09:25:25 -07:00
Andreas Huber
fb86152331 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
Kenny Root
d7b421b4de Fix up PackageManager tests
PackageManagerTests was trying to mount and unmount the media without
waiting for the correct state to arrive. It was proceeding with any
state transition.

Some tests had their own volume mounting and unmounting code that was
flawed, so switch it to the more robust mountMedia() and unmountMedia()
implementations.

Change-Id: If464927bb09dd15cb040c6cce195a6ad8452de95
2010-08-05 08:40:09 -07:00
Brian Carlstrom
3c7c351a62 Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30
git cherry-pick --no-commit 5e8a587d

Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
2010-08-04 23:47:38 -07:00
Chung-yih Wang
ccd0b6953f Revert "Revert "Move SIP telephony related codes to framework.""
This reverts commit cde66df44240cfe5a7bec12ac52464c3bf26c14f.

Change-Id: I87da883b45350ec8f7da71e9bd392b075ea30ca7
2010-08-05 14:21:19 +08:00
Chung-yih Wang
bc088ddecb 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."
2010-08-04 22:33:08 -07:00
Chung-yih Wang
cde66df442 Revert "Move SIP telephony related codes to framework."
This reverts commit b631dcf3eb449ddec756bea330f4e70b996ffb9e.
2010-08-05 13:25:38 +08:00
Chung-yih Wang
d088cef7da 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.
2010-08-04 21:18:57 -07:00
Chung-yih Wang
468e35efc5 Merge "Move SIP telephony related codes to framework." into gingerbread 2010-08-04 21:16:48 -07:00
Daniel Sandler
811d66f149 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.
2010-08-04 20:36:09 -07:00
Daniel Sandler
9b87770f53 Merge "Fix crash when startForeground posts a broken Notification." into gingerbread 2010-08-04 20:33:32 -07:00
Chung-yih Wang
b631dcf3eb Move SIP telephony related codes to framework.
+ hardcode the sip service for build dependency.

Change-Id: Ib0e9717c9b87eb6e06ffa3a7b01ae31184de61bb
2010-08-05 11:11:58 +08:00
Chung-yih Wang
bbd1a04c62 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.
2010-08-04 19:30:37 -07:00
Chung-yih Wang
8c5035696b Merge "Move the sip related codes to framework." into gingerbread 2010-08-04 19:28:23 -07:00
Chung-yih Wang
363c2ab82c Move the sip related codes to framework.
Change-Id: Ib81dadc39b73325c8438f078c7251857a83834fe
2010-08-05 10:25:53 +08:00
John Wang
efd938f77a 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"
2010-08-04 18:56:37 -07:00
John Wang
62f066a14a Merge "Add register methods in CallManager "do not merge"" into gingerbread 2010-08-04 18:54:55 -07:00
Scott Main
c9de8c34a3 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;
2010-08-04 18:05:26 -07:00
Scott Main
ef9fd39d73 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
97c2d840a1 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
769f9b8980 am 5b86de94: fix doc bugs
Merge commit '5b86de94a163ce4c52ab08a9820f9d78414e1767' into gingerbread

* commit '5b86de94a163ce4c52ab08a9820f9d78414e1767':
  fix doc bugs
2010-08-04 18:02:18 -07:00
Scott Main
8dd87ad944 fix some doc errors in the resources;
add link to resource docs for ColorStateList class

Change-Id: I7f59bfd136d5bd3c2ea066b6123ee13ccd57f502
2010-08-04 17:33:33 -07:00
Scott Main
5b86de94a1 fix doc bugs
Change-Id: Ic0cec3818fdc7692ea7aa3152ecb444203097157
2010-08-04 17:07:36 -07:00
Kenny Root
aec3e36fd4 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
2d817f7596 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
533dc7866c 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
7d14619787 Merge "Fix divide by zero." into gingerbread 2010-08-04 15:37:37 -07:00
Marco Nelissen
0fc9f34d94 Fix divide by zero.
Change-Id: I3113234aa5936965424dde5b24e448df1be0b603
2010-08-04 15:29:26 -07:00
Kenny Root
d6dc45c30c 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
125816a2a8 Merge "Failure to move .dex in eng builds is not fatal" into gingerbread 2010-08-04 15:01:56 -07:00
jsh
0b4e3ad356 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
82cadee3ca Merge "Add support for PSC of serving cell." into gingerbread 2010-08-04 14:32:19 -07:00
Andreas Huber
ac8e7060e0 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
86d2c088f1 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
1f513d8821 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
1cd6340a72 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
1564455518 Don't return a decoder error if the encoded stream does not start with SPS/PPS.
Change-Id: I960ada0c53f8ffe413ecd07c2c754a996841f592
2010-08-04 14:08:14 -07:00
Andreas Huber
c17f35dd92 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
Andreas Huber
426b650e1b Specification of codec specific data as part of the session description is now optional.
Change-Id: Ie1953909e1d241381add3cc82a7a1f7d7d1540f2
2010-08-04 14:04:31 -07:00
Kenny Root
e2f7417529 Failure to move .dex in eng builds is not fatal
When moving between program locations or application names, the .dex
file is moved by installd. However, in engineering builds, the
applications are run through dexopt on-demand. If the .dex file fails to
move, we can ignore it because it's most likely because the .dex file
does not exist yet.

Change-Id: Id5c4dbfa33f19c976acd9f184ccd637752326629
2010-08-04 13:35:33 -07:00
Kenny Root
508715259c Add more debugging to installd
If a command to installd fails, it would be nice to know exactly why.
Log failures and the errno associated with the failures.

Change-Id: Ia3122675f243037c556d3a49d06da7e03b8c59f6
2010-08-04 13:15:12 -07:00
Andreas Huber
57648e4eec 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.
Change-Id: I95b8dd487061add9bade15749e563b01cd99d9a6
2010-08-04 11:49:24 -07:00
Jaikumar Ganesh
c4ed734bd8 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
737998f595 Merge "Add Blocked Device property." into gingerbread 2010-08-04 11:28:55 -07:00
Jaikumar Ganesh
6eb300e650 Add Blocked Device property.
Change-Id: I76b3c361af95ac9d5fb43178965763f873c0fbf9
2010-08-04 11:26:38 -07:00
Eric Fischer
c1b387aed8 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
d89443d866 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-04 10:40:36 -07:00
Eric Fischer
33dc1d7cd0 Import revised translations. DO NOT MERGE
Change-Id: Ibc3e9f1f83159835c2e6c3bcdaa8ff6a7e7fa384
2010-08-04 10:37:25 -07:00
Eric Laurent
eec3fca627 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
7629e8dd14 Merge "Fix issue 2876124." into gingerbread 2010-08-04 10:03:36 -07:00