13229 Commits

Author SHA1 Message Date
Daisuke Miyakawa
f1072c568e am e7a5141c: am 66da163d: Move some useful logic to VCardTestsBase.java
Merge commit 'e7a5141c0db324ab17b0b5f316463cc8a6a3c36a'

* commit 'e7a5141c0db324ab17b0b5f316463cc8a6a3c36a':
  Move some useful logic to VCardTestsBase.java
2009-11-03 00:10:08 -08:00
Dirk Dougherty
3bb6baa349 am 759ac9e3: am 21cbd52b: am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
Merge commit '759ac9e3da0323177cd4ce1f85c04252086b6ea4'

* commit '759ac9e3da0323177cd4ce1f85c04252086b6ea4':
  doc change: misc doc fixes.
2009-11-03 00:09:57 -08:00
Daisuke Miyakawa
e7a5141c0d am 66da163d: Move some useful logic to VCardTestsBase.java
Merge commit '66da163d4115688a8be7abb96c409a9858f9a8cd' into eclair-mr2-plus-aosp

* commit '66da163d4115688a8be7abb96c409a9858f9a8cd':
  Move some useful logic to VCardTestsBase.java
2009-11-03 00:04:43 -08:00
Daisuke Miyakawa
66da163d41 Move some useful logic to VCardTestsBase.java
Internal issue number: 2195990
2009-11-03 16:53:58 +09:00
Dirk Dougherty
759ac9e3da am 21cbd52b: am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
Merge commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e' into eclair-mr2-plus-aosp

* commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e':
  doc change: misc doc fixes.
2009-11-02 18:29:52 -08:00
Dirk Dougherty
21cbd52b7a am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
Merge commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4' into eclair-mr2

* commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4':
  doc change: misc doc fixes.
2009-11-02 18:24:29 -08:00
Dirk Dougherty
483d29c0dd am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
Merge commit '671c61d66f8d556f206d167d0f3c3bbe037ed86b' into eclair

* commit '671c61d66f8d556f206d167d0f3c3bbe037ed86b':
  doc change: misc doc fixes.
2009-11-02 18:17:26 -08:00
Android (Google) Code Review
671c61d66f Merge change Iaf5d2cc2 into eclair-sdk
* changes:
  doc change: misc doc fixes.
2009-11-02 21:05:30 -05:00
James Dong
ffca760612 am 76370140: am 9d4dcf28: am f67eff17: Merge change Ib0036762 into eclair
Merge commit '763701408b09195a2b82bd088fc83c61b27c9be4'

* commit '763701408b09195a2b82bd088fc83c61b27c9be4':
  Add windows media support check in MediaMetadataRetrieverTest
2009-11-02 17:46:36 -08:00
Brett Chabot
56c93389a2 am f13b7c7f: (-s ours) am 4aa7e0aa: am d6af2e0c: (-s ours) Merge change I43a335c3 into eclair
Merge commit 'f13b7c7f7ce4b1bd14af0280ef51db375eb65fd8'

* commit 'f13b7c7f7ce4b1bd14af0280ef51db375eb65fd8':
  Suppress takePicture test from continuous DO NOT MERGE.
2009-11-02 17:46:21 -08:00
Brett Chabot
a98c5675d2 am 64e648fd: am b580d53e: am 774d956d: Merge change Ic8c7ca7b into eclair
Merge commit '64e648fdd93c9642bdbda3e44082e50f4baeb0c1'

* commit '64e648fdd93c9642bdbda3e44082e50f4baeb0c1':
  Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
2009-11-02 17:46:12 -08:00
Dima Zavin
7a889a37be am 8559ca18: am 0a5201f0: am dfc7244a: libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
Merge commit '8559ca18de9cdd60bd8979e641c4fd1a8e66b62e'

* commit '8559ca18de9cdd60bd8979e641c4fd1a8e66b62e':
  libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
2009-11-02 17:46:03 -08:00
Jesse Wilson
fcca5a95e6 Another round of API xml changes for the piped streams change 2009-11-02 17:38:23 -08:00
James Dong
763701408b am 9d4dcf28: am f67eff17: Merge change Ib0036762 into eclair
Merge commit '9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8' into eclair-mr2-plus-aosp

* commit '9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8':
  Add windows media support check in MediaMetadataRetrieverTest
2009-11-02 17:27:54 -08:00
Brett Chabot
f13b7c7f7c am 4aa7e0aa: am d6af2e0c: (-s ours) Merge change I43a335c3 into eclair
Merge commit '4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7' into eclair-mr2-plus-aosp

* commit '4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7':
  Suppress takePicture test from continuous DO NOT MERGE.
2009-11-02 17:20:30 -08:00
Brett Chabot
64e648fdd9 am b580d53e: am 774d956d: Merge change Ic8c7ca7b into eclair
Merge commit 'b580d53e7517e6020ee42c4f0fcda21bf381c74e' into eclair-mr2-plus-aosp

* commit 'b580d53e7517e6020ee42c4f0fcda21bf381c74e':
  Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
2009-11-02 17:20:08 -08:00
James Dong
9d4dcf287c am f67eff17: Merge change Ib0036762 into eclair
Merge commit 'f67eff177515baa421d8717ee20efdc516fde580' into eclair-mr2

* commit 'f67eff177515baa421d8717ee20efdc516fde580':
  Add windows media support check in MediaMetadataRetrieverTest
2009-11-02 17:19:51 -08:00
Brett Chabot
4aa7e0aae1 am d6af2e0c: (-s ours) Merge change I43a335c3 into eclair
Merge commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80' into eclair-mr2

* commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80':
  Suppress takePicture test from continuous DO NOT MERGE.
2009-11-02 17:15:02 -08:00
Brett Chabot
b580d53e75 am 774d956d: Merge change Ic8c7ca7b into eclair
Merge commit '774d956d5d2f6bece15c10c0db275596148c7ef8' into eclair-mr2

* commit '774d956d5d2f6bece15c10c0db275596148c7ef8':
  Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
2009-11-02 17:14:54 -08:00
Android (Google) Code Review
f67eff1775 Merge change Ib0036762 into eclair
* changes:
  Add windows media support check in MediaMetadataRetrieverTest bug 2232274
2009-11-02 20:13:20 -05:00
Dima Zavin
8559ca18de am 0a5201f0: am dfc7244a: libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
Merge commit '0a5201f01cac963752e0b4635f081c73cb6f1959' into eclair-mr2-plus-aosp

* commit '0a5201f01cac963752e0b4635f081c73cb6f1959':
  libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
2009-11-02 17:10:13 -08:00
Android (Google) Code Review
d6af2e0cbf Merge change I43a335c3 into eclair
* changes:
  Suppress takePicture test from continuous DO NOT MERGE.
2009-11-02 20:08:16 -05:00
Android (Google) Code Review
774d956d5d Merge change Ic8c7ca7b into eclair
* changes:
  Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
2009-11-02 20:07:11 -05:00
Dima Zavin
0a5201f01c am dfc7244a: libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
Merge commit 'dfc7244aa874ae31cc13758e1e2cf6112f7a66b4' into eclair-mr2

* commit 'dfc7244aa874ae31cc13758e1e2cf6112f7a66b4':
  libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
2009-11-02 17:04:57 -08:00
Jesse Wilson
0f4b9f91f6 Fix api.xml for piped stream changes (see change Ie098e2fa) 2009-11-02 16:41:53 -08:00
Dima Zavin
dfc7244aa8 libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
Change-Id: Ia7beb800f5a24beaa4b7f3032b486d4ed1991b23
Signed-off-by: Dima Zavin <dima@android.com>
2009-11-02 16:36:45 -08:00
Jaikumar Ganesh
60cd3aa6d9 am 1150e818: (-s ours) am 395a20ae: am a229ceda: (-s ours) Merge change I73d6c0f8 into eclair
Merge commit '1150e818727d9a0620ecd5c5f7ef40ce0078c7f4'

* commit '1150e818727d9a0620ecd5c5f7ef40ce0078c7f4':
  Add ability to disable sending Photos using Vcard. Do Not Merge
2009-11-02 16:10:11 -08:00
Jaikumar Ganesh
1150e81872 am 395a20ae: am a229ceda: (-s ours) Merge change I73d6c0f8 into eclair
Merge commit '395a20aeed0d7c58c978ed32cf50253280723cac' into eclair-mr2-plus-aosp

* commit '395a20aeed0d7c58c978ed32cf50253280723cac':
  Add ability to disable sending Photos using Vcard. Do Not Merge
2009-11-02 16:04:24 -08:00
Jaikumar Ganesh
395a20aeed am a229ceda: (-s ours) Merge change I73d6c0f8 into eclair
Merge commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992' into eclair-mr2

* commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992':
  Add ability to disable sending Photos using Vcard. Do Not Merge
2009-11-02 15:54:35 -08:00
Android (Google) Code Review
a229cedadd Merge change I73d6c0f8 into eclair
* changes:
  Add ability to disable sending Photos using Vcard. Do Not Merge
2009-11-02 18:46:04 -05:00
Jason Sams
46f385459f am 15ec511b: am 38f95586: am 03e778b9: Merge change Ic4918c30 into eclair
Merge commit '15ec511b5c5cdb901bf1bd0e26ff0514635fc681'

* commit '15ec511b5c5cdb901bf1bd0e26ff0514635fc681':
  Fix a build break.  Too many branches to keep track of.
2009-11-02 15:23:02 -08:00
Iliyan Malchev
a3cbfe0e8f am 8ba42ba8: am cd767bfd: am d4649b2f: Merge change Ibaef6141 into eclair
Merge commit '8ba42ba83b206929c4c13c0b8ef24de87a92f42c'

* commit '8ba42ba83b206929c4c13c0b8ef24de87a92f42c':
  libbinder: add a NO_CACHING flag to MemoryHeapBase
2009-11-02 15:22:53 -08:00
Marco Nelissen
5d66d7fc27 am fb1d992f: am 1166ff76: am 1d9246e8: Merge change Id095e180 into eclair
Merge commit 'fb1d992f4b8addad729a94cb006a732a40b62756'

* commit 'fb1d992f4b8addad729a94cb006a732a40b62756':
  Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
2009-11-02 15:22:44 -08:00
Jason Sams
43b5a56644 am 766df995: am d31b0e44: am 3bbb5e9a: Merge change Ib7a6c434 into eclair
Merge commit '766df995e30caa054cc25068e55f160c765590eb'

* commit '766df995e30caa054cc25068e55f160c765590eb':
  Fix some leaks.  This fixes the major malloc memory leak in allApps.  Still tracking some much more minor issues.
2009-11-02 15:22:34 -08:00
Jason Sams
15ec511b5c am 38f95586: am 03e778b9: Merge change Ic4918c30 into eclair
Merge commit '38f95586a6540756d5de383145b49a8625d49d23' into eclair-mr2-plus-aosp

* commit '38f95586a6540756d5de383145b49a8625d49d23':
  Fix a build break.  Too many branches to keep track of.
2009-11-02 15:16:37 -08:00
Jason Sams
38f95586a6 am 03e778b9: Merge change Ic4918c30 into eclair
Merge commit '03e778b913adfb450889c51adf042388ada7c5f8' into eclair-mr2

* commit '03e778b913adfb450889c51adf042388ada7c5f8':
  Fix a build break.  Too many branches to keep track of.
2009-11-02 15:11:37 -08:00
Iliyan Malchev
8ba42ba83b am cd767bfd: am d4649b2f: Merge change Ibaef6141 into eclair
Merge commit 'cd767bfd1c8e3103f99207ecfa34385e76518e82' into eclair-mr2-plus-aosp

* commit 'cd767bfd1c8e3103f99207ecfa34385e76518e82':
  libbinder: add a NO_CACHING flag to MemoryHeapBase
2009-11-02 15:07:04 -08:00
Marco Nelissen
fb1d992f4b am 1166ff76: am 1d9246e8: Merge change Id095e180 into eclair
Merge commit '1166ff76eb3dbb5304dc40b3056e48c2c9dc7577' into eclair-mr2-plus-aosp

* commit '1166ff76eb3dbb5304dc40b3056e48c2c9dc7577':
  Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
2009-11-02 15:06:57 -08:00
Jason Sams
766df995e3 am d31b0e44: am 3bbb5e9a: Merge change Ib7a6c434 into eclair
Merge commit 'd31b0e44af38594691440ba1ab5150b1a8f8480b' into eclair-mr2-plus-aosp

* commit 'd31b0e44af38594691440ba1ab5150b1a8f8480b':
  Fix some leaks.  This fixes the major malloc memory leak in allApps.  Still tracking some much more minor issues.
2009-11-02 15:06:49 -08:00
Android (Google) Code Review
03e778b913 Merge change Ic4918c30 into eclair
* changes:
  Fix a build break.  Too many branches to keep track of.
2009-11-02 18:05:55 -05:00
Jason Sams
c4918c3014 Fix a build break. Too many branches to keep track of. 2009-11-02 15:05:04 -08:00
Iliyan Malchev
cd767bfd1c am d4649b2f: Merge change Ibaef6141 into eclair
Merge commit 'd4649b2f8ea8285a4eb3c47e87520c7835e6c672' into eclair-mr2

* commit 'd4649b2f8ea8285a4eb3c47e87520c7835e6c672':
  libbinder: add a NO_CACHING flag to MemoryHeapBase
2009-11-02 15:01:36 -08:00
Android (Google) Code Review
d4649b2f8e Merge change Ibaef6141 into eclair
* changes:
  libbinder: add a NO_CACHING flag to MemoryHeapBase
2009-11-02 17:55:43 -05:00
Marco Nelissen
1166ff76eb am 1d9246e8: Merge change Id095e180 into eclair
Merge commit '1d9246e8bb8de624e14c55dce57e93da18cfd7a8' into eclair-mr2

* commit '1d9246e8bb8de624e14c55dce57e93da18cfd7a8':
  Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
2009-11-02 14:41:28 -08:00
Jason Sams
d31b0e44af am 3bbb5e9a: Merge change Ib7a6c434 into eclair
Merge commit '3bbb5e9a1e792795dc6965dd399ef78d4e6556cd' into eclair-mr2

* commit '3bbb5e9a1e792795dc6965dd399ef78d4e6556cd':
  Fix some leaks.  This fixes the major malloc memory leak in allApps.  Still tracking some much more minor issues.
2009-11-02 14:41:21 -08:00
Android (Google) Code Review
1d9246e8bb Merge change Id095e180 into eclair
* changes:
  Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
2009-11-02 17:36:52 -05:00
Android (Google) Code Review
3bbb5e9a1e Merge change Ib7a6c434 into eclair
* changes:
  Fix some leaks.  This fixes the major malloc memory leak in allApps.  Still tracking some much more minor issues.
2009-11-02 17:31:15 -05:00
Jason Sams
b7a6c4340a Fix some leaks. This fixes the major malloc memory leak in allApps. Still tracking some much more minor issues. 2009-11-02 14:25:10 -08:00
Dan Egnor
cb93e01f4c am 96c17849: am cc1d35e2: am afd81beb: Merge change Icbb3aa0a into eclair
Merge commit '96c178498c7c65388955cb8d2f8f11b0fac76c8d'

* commit '96c178498c7c65388955cb8d2f8f11b0fac76c8d':
  Use setRepeating() rather than setInexactRepeating() for backup scheduling,
2009-11-02 14:16:15 -08:00
Dan Egnor
96c178498c am cc1d35e2: am afd81beb: Merge change Icbb3aa0a into eclair
Merge commit 'cc1d35e2e5e0c2370361294a64ff0e580856b9d2' into eclair-mr2-plus-aosp

* commit 'cc1d35e2e5e0c2370361294a64ff0e580856b9d2':
  Use setRepeating() rather than setInexactRepeating() for backup scheduling,
2009-11-02 14:10:33 -08:00