Commit Graph

38903 Commits

Author SHA1 Message Date
Fred Quintana
2f20b04c14 am a27b7822: am ec5d9fb4: Merge change 23370 into eclair
Merge commit 'a27b7822200ab8f7a1978ca27ae3e14929b9d665'

* commit 'a27b7822200ab8f7a1978ca27ae3e14929b9d665':
  Revert "- don't schedule syncs that we will never dispatch"
2009-08-31 17:29:03 -07:00
Joe Onorato
8580b6fc3e am ae209acd: Don\'t leak jni refs.
Merge commit 'ae209acd8d48755df7d49459b1bcbc3b8e20561d' into eclair-plus-aosp

* commit 'ae209acd8d48755df7d49459b1bcbc3b8e20561d':
  Don't leak jni refs.
2009-08-31 17:28:13 -07:00
Fred Quintana
a27b782220 am ec5d9fb4: Merge change 23370 into eclair
Merge commit 'ec5d9fb47d180d84e3eff0b2138966579be6ac00' into eclair-plus-aosp

* commit 'ec5d9fb47d180d84e3eff0b2138966579be6ac00':
  Revert "- don't schedule syncs that we will never dispatch"
2009-08-31 17:26:43 -07:00
Joe Onorato
ae209acd8d Don't leak jni refs. 2009-08-31 17:25:08 -07:00
Fred Quintana
fcb14322f4 re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync() 2009-08-31 17:25:05 -07:00
Android (Google) Code Review
ec5d9fb47d Merge change 23370 into eclair
* changes:
  Revert "- don't schedule syncs that we will never dispatch"
2009-08-31 17:24:17 -07:00
Fred Quintana
c58b611652 Revert "- don't schedule syncs that we will never dispatch"
This reverts commit fae7ff106b.
2009-08-31 17:20:08 -07:00
Romain Guy
7e66cb6582 am cfbff6c9: am f428f8ae: Merge change 23329 into eclair
Merge commit 'cfbff6c985f6aa690ee8e4f9cb8006382d214fcf'

* commit 'cfbff6c985f6aa690ee8e4f9cb8006382d214fcf':
  Load bitmap resources entirely from native code.
2009-08-31 17:19:28 -07:00
Romain Guy
cfbff6c985 am f428f8ae: Merge change 23329 into eclair
Merge commit 'f428f8aecea9ae7a258dfc05f4ad4563938f1ed5' into eclair-plus-aosp

* commit 'f428f8aecea9ae7a258dfc05f4ad4563938f1ed5':
  Load bitmap resources entirely from native code.
2009-08-31 17:17:13 -07:00
Android (Google) Code Review
f428f8aece Merge change 23329 into eclair
* changes:
  Load bitmap resources entirely from native code.
2009-08-31 17:15:42 -07:00
Jaikumar Ganesh
5ba22e9e11 am 2ebf7793: am c91ad28f: Merge change 23218 into eclair
Merge commit '2ebf7793e42df72d4198461487f3bd73f17b32a4'

* commit '2ebf7793e42df72d4198461487f3bd73f17b32a4':
  Fix property being cleared when DeviceFound signal is received.
2009-08-31 16:56:52 -07:00
Andreas Huber
cf68d5b82a am 81002eb9: am bf1071c0: Merge change 23356 into eclair
Merge commit '81002eb9ccd60e936b8960ddd3ce92af81dd2c14'

* commit '81002eb9ccd60e936b8960ddd3ce92af81dd2c14':
  Temporarily unlock our mutex while fetching a buffer from the upstream source.
2009-08-31 16:56:46 -07:00
Jaikumar Ganesh
2ebf7793e4 am c91ad28f: Merge change 23218 into eclair
Merge commit 'c91ad28ff9173971c1d886f884250b1e774a40a6' into eclair-plus-aosp

* commit 'c91ad28ff9173971c1d886f884250b1e774a40a6':
  Fix property being cleared when DeviceFound signal is received.
2009-08-31 16:54:37 -07:00
Android (Google) Code Review
c91ad28ff9 Merge change 23218 into eclair
* changes:
  Fix property being cleared when DeviceFound signal is received.
2009-08-31 16:52:38 -07:00
Andreas Huber
81002eb9cc am bf1071c0: Merge change 23356 into eclair
Merge commit 'bf1071c07979b03a9f5e8281aba82ed05513185e' into eclair-plus-aosp

* commit 'bf1071c07979b03a9f5e8281aba82ed05513185e':
  Temporarily unlock our mutex while fetching a buffer from the upstream source.
2009-08-31 16:47:09 -07:00
Daisuke Miyakawa
61e06289bb am 08761779: am 450ff8a4: Merge change 23357 into eclair
Merge commit '08761779616949b496c002bed7ce88eb909c65fc'

* commit '08761779616949b496c002bed7ce88eb909c65fc':
  Fix double-free problem in EmojiFactory.
2009-08-31 16:46:18 -07:00
Jean-Michel Trivi
9a87e50744 am 8b8077e4: am 6896aef0: Merge change 23338 into eclair
Merge commit '8b8077e427389d5f0328598bc25428ae6147e9e5'

* commit '8b8077e427389d5f0328598bc25428ae6147e9e5':
  Clean TTS logs: use a common TAG in the TTS service, don't show
2009-08-31 16:46:10 -07:00
Robert Greenwalt
9f11936651 am 624a49cf: am 10f8f111: Merge change 23341 into eclair
Merge commit '624a49cf2d616a8b0c4aa034bd2442f736d8aaa1'

* commit '624a49cf2d616a8b0c4aa034bd2442f736d8aaa1':
  Fix replacement-after-add of resource files in overlay.
2009-08-31 16:46:01 -07:00
Daisuke Miyakawa
69a776c27d am 78e9389a: am f66e2e24: Merge change 23344 into eclair
Merge commit '78e9389a213df93a2e1d55b9961ce8aa103e7301'

* commit '78e9389a213df93a2e1d55b9961ce8aa103e7301':
  Make vCard composer handle null of Photo entry correctly.
2009-08-31 16:45:56 -07:00
Daisuke Miyakawa
2d88dfaeed am 08271d05: am cedcb135: Merge change 23343 into eclair
Merge commit '08271d05e338b483b12fae0f52a9519677910176'

* commit '08271d05e338b483b12fae0f52a9519677910176':
  Use Email.TYPE_MOBILE
2009-08-31 16:45:51 -07:00
Fred Quintana
2f449b745b am 91800118: am 7cb08acc: Merge change 23066 into eclair
Merge commit '91800118a129bd63fc19e90da6b52c67036fa424'

* commit '91800118a129bd63fc19e90da6b52c67036fa424':
  - don't schedule syncs that we will never dispatch
2009-08-31 16:45:42 -07:00
Scott Main
da5bf55756 am afc12191: am 9cba48c0: am 728157b4: Merge change 23242 into donut
Merge commit 'afc12191fd0a164aa50f92434ddf0fb509fc972c'

* commit 'afc12191fd0a164aa50f92434ddf0fb509fc972c':
  docs only.
2009-08-31 16:45:37 -07:00
Nick Pelly
c53b9cd95c am f7d1c273: am 3e59cf7e: Merge change 23335 into eclair
Merge commit 'f7d1c27327b6832ce97f233f27b2927a05f8b387'

* commit 'f7d1c27327b6832ce97f233f27b2927a05f8b387':
  Set RFCOMM SO_SNDBUF size to 70 KB for large RFCOMM writes.
2009-08-31 16:45:27 -07:00
Jean-Michel Trivi
9f384b467e am 81608741: am 550d48f3: Merge change 23300 into eclair
Merge commit '81608741dc26da8ce6ddfe4a86fa1b956cb6406b'

* commit '81608741dc26da8ce6ddfe4a86fa1b956cb6406b':
  Add a synchronous stop method to TTS synth engine so that upon its destruction,
2009-08-31 16:45:14 -07:00
Ye Wen
7a7a51681e am 18ab9629: am 9399a3de: Merge change 23320 into eclair
Merge commit '18ab96294f0842570f608e692dc3c88ce289df4f'

* commit '18ab96294f0842570f608e692dc3c88ce289df4f':
  Set result code in REMOTE_INTENT receiver for subscribed feeds.
2009-08-31 16:45:03 -07:00
Android (Google) Code Review
bf1071c079 Merge change 23356 into eclair
* changes:
  Temporarily unlock our mutex while fetching a buffer from the upstream source.
2009-08-31 16:44:46 -07:00
Yu Shan Emily Lau
e2e20bbbde am 4e22f62c: am 52d6245b: Merge change 22995 into eclair
Merge commit '4e22f62cbb2108ee1f53f546ba2708f48e83829a'

* commit '4e22f62cbb2108ee1f53f546ba2708f48e83829a':
  modified:   res/layout/surface_view.xml
2009-08-31 16:44:44 -07:00
Daniel Sandler
44edb4bb68 am 6de3cc94: am de5cd3d8: Merge change 23289 into eclair
Merge commit '6de3cc94d276dc7d6a3b0082f20262d824f588ee'

* commit '6de3cc94d276dc7d6a3b0082f20262d824f588ee':
  Fix http://b/issue?id=2086835 (unlock pattern graphics misaligned).
2009-08-31 16:44:08 -07:00
Eric Laurent
4be9c02ba8 am 90fa99b1: am f7c7a67d: Merge change 23277 into eclair
Merge commit '90fa99b14f84724a7beae8dd9b1870b173ec43ef'

* commit '90fa99b14f84724a7beae8dd9b1870b173ec43ef':
  Fix issue 2085690: AudioFlinger must properly terminate the input and output threads when destroyed.
2009-08-31 16:43:55 -07:00
Jean-Baptiste Queru
ea014dca33 am 1d5b13d4: am 3ad34cac: am 57f03f0b: Merge snapshot version of donut back into the main tree
Merge commit '1d5b13d4d7d59ce56c73733d299cfa8aa34e5e36'

* commit '1d5b13d4d7d59ce56c73733d299cfa8aa34e5e36':
  donut snapshot
2009-08-31 16:43:48 -07:00
Dmitri Plotnikov
11f79e449a am e266995b: am f35bce45: Adding a column to Contacts, which will be used as an additional "soft" identity.
Merge commit 'e266995bb15914b2e648901b379460953a1ff73b'

* commit 'e266995bb15914b2e648901b379460953a1ff73b':
  Adding a column to Contacts, which will be used as an additional "soft" identity.
2009-08-31 16:43:39 -07:00
Xavier Ducrohet
f03fb486ac Add error output to pm for FAILED_MISSING_FEATURE
Change-Id: Ib9955b69b69db7d442402ab33e148cb40dec3d40
2009-08-31 16:42:12 -07:00
Andreas Huber
6db4aad623 Temporarily unlock our mutex while fetching a buffer from the upstream source. 2009-08-31 16:40:08 -07:00
Daisuke Miyakawa
0876177961 am 450ff8a4: Merge change 23357 into eclair
Merge commit '450ff8a48c9b78729332c99d680560b583f17e7d' into eclair-plus-aosp

* commit '450ff8a48c9b78729332c99d680560b583f17e7d':
  Fix double-free problem in EmojiFactory.
2009-08-31 16:35:42 -07:00
Android (Google) Code Review
450ff8a48c Merge change 23357 into eclair
* changes:
  Fix double-free problem in EmojiFactory.
2009-08-31 16:33:10 -07:00
Daisuke Miyakawa
c81c43991c Fix double-free problem in EmojiFactory. 2009-09-01 08:32:24 +09:00
Jean-Michel Trivi
8b8077e427 am 6896aef0: Merge change 23338 into eclair
Merge commit '6896aef0bd3132a64cfdee6c1276c4bbbb25d8e3' into eclair-plus-aosp

* commit '6896aef0bd3132a64cfdee6c1276c4bbbb25d8e3':
  Clean TTS logs: use a common TAG in the TTS service, don't show
2009-08-31 15:40:47 -07:00
Android (Google) Code Review
6896aef0bd Merge change 23338 into eclair
* changes:
  Clean TTS logs: use a common TAG in the TTS service, don't show an error when loading the native synth lib.
2009-08-31 15:39:07 -07:00
Robert Greenwalt
624a49cf2d am 10f8f111: Merge change 23341 into eclair
Merge commit '10f8f11106ccf492e15ee2a6ba2be99ec4578088' into eclair-plus-aosp

* commit '10f8f11106ccf492e15ee2a6ba2be99ec4578088':
  Fix replacement-after-add of resource files in overlay.
2009-08-31 15:20:35 -07:00
Daisuke Miyakawa
78e9389a21 am f66e2e24: Merge change 23344 into eclair
Merge commit 'f66e2e249d3a72a8db2817e5969b1f118b07dd69' into eclair-plus-aosp

* commit 'f66e2e249d3a72a8db2817e5969b1f118b07dd69':
  Make vCard composer handle null of Photo entry correctly.
2009-08-31 15:20:30 -07:00
Daisuke Miyakawa
08271d05e3 am cedcb135: Merge change 23343 into eclair
Merge commit 'cedcb13547d3c65091ca12b1f69be563af442eb1' into eclair-plus-aosp

* commit 'cedcb13547d3c65091ca12b1f69be563af442eb1':
  Use Email.TYPE_MOBILE
2009-08-31 15:20:25 -07:00
Android (Google) Code Review
10f8f11106 Merge change 23341 into eclair
* changes:
  Fix replacement-after-add of resource files in overlay.
2009-08-31 15:18:44 -07:00
Android (Google) Code Review
f66e2e249d Merge change 23344 into eclair
* changes:
  Make vCard composer handle null of Photo entry correctly.
2009-08-31 15:18:43 -07:00
Android (Google) Code Review
cedcb13547 Merge change 23343 into eclair
* changes:
  Use Email.TYPE_MOBILE
2009-08-31 15:18:28 -07:00
Daisuke Miyakawa
f75c94f7a9 Make vCard composer handle null of Photo entry correctly.
Internal bug id: 2088922
2009-09-01 07:17:20 +09:00
Fred Quintana
91800118a1 am 7cb08acc: Merge change 23066 into eclair
Merge commit '7cb08accdd923e05518f4bacd103bfe68d589e5d' into eclair-plus-aosp

* commit '7cb08accdd923e05518f4bacd103bfe68d589e5d':
  - don't schedule syncs that we will never dispatch
2009-08-31 15:05:12 -07:00
Scott Main
afc12191fd am 9cba48c0: am 728157b4: Merge change 23242 into donut
Merge commit '9cba48c099f7900520252421d738d4eed5997534' into eclair-plus-aosp

* commit '9cba48c099f7900520252421d738d4eed5997534':
  docs only.
2009-08-31 15:05:07 -07:00
Android (Google) Code Review
7cb08accdd Merge change 23066 into eclair
* changes:
  - don't schedule syncs that we will never dispatch - expedite the INITIALIZATION sync
2009-08-31 15:03:32 -07:00
Scott Main
9cba48c099 am 728157b4: Merge change 23242 into donut
Merge commit '728157b4af937bc34706b71c21e9d804ca83039d' into eclair

* commit '728157b4af937bc34706b71c21e9d804ca83039d':
  docs only.
2009-08-31 15:02:35 -07:00
Android (Google) Code Review
728157b4af Merge change 23242 into donut
* changes:
  docs only. add uses-feature "name" attribute
2009-08-31 15:00:36 -07:00