Commit Graph

5736 Commits

Author SHA1 Message Date
Dianne Hackborn
9784c8c52e am 2ade6421: Merge change I775e1ec0 into eclair
Merge commit '2ade6421f2d6dd615b559c951deace7143958b90' into eclair-mr2

* commit '2ade6421f2d6dd615b559c951deace7143958b90':
  Debugging for issue #2250075: Desk dock clock app sometimes doesn't
2009-11-11 18:53:29 -08:00
Android (Google) Code Review
738a65ac62 Merge change I775e1ec0 into eclair
* changes:
  Debugging for issue #2250075: Desk dock clock app sometimes doesn't
2009-11-11 18:16:05 -08:00
Eric Fischer
4bb25b87d9 am f2335642: Merge change I7fb3bc59 into eclair
Merge commit 'f233564284d492815b1f45f6f2bd66d96b77d9ea' into eclair-mr2

* commit 'f233564284d492815b1f45f6f2bd66d96b77d9ea':
  Add new date formats for the lock screen.
2009-11-11 18:09:17 -08:00
Android (Google) Code Review
b365e7fd7d Merge change I7fb3bc59 into eclair
* changes:
  Add new date formats for the lock screen.
2009-11-11 18:05:12 -08:00
Romain Guy
2871d6aeb8 am 3e584fc9: Merge change I5975651f into eclair
Merge commit '3e584fc944e3d694b4233450f386bd2a930420bf' into eclair-mr2

* commit '3e584fc944e3d694b4233450f386bd2a930420bf':
  Don't feed the timezone to RenderScript time functions, let the library figure it out.
2009-11-11 17:15:33 -08:00
Mike Lockwood
028e957ad3 am f1f26bbb: Merge change I7b8b6cfb into eclair
Merge commit 'f1f26bbb2aa36f69f0efcac21ea27b1055b98a11' into eclair-mr2

* commit 'f1f26bbb2aa36f69f0efcac21ea27b1055b98a11':
  Do not force screen on when undocking from the desk dock.
2009-11-11 17:15:23 -08:00
Fred Quintana
8143db662f am 4cb6fc7e: Merge change Icc48b1e7 into eclair
Merge commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20' into eclair-mr2

* commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20':
  don't request a sync when temp providers are created
2009-11-11 17:14:56 -08:00
Grace Kloba
f781e28171 am bf5b632a: Use getViewHeightWithTitle() to honor the scrollbar setting when computing the maxScrollY for fling. This is honored in the regular scroll in computeVerticalScrollExtent().
Merge commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c' into eclair-mr2

* commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c':
  Use getViewHeightWithTitle() to honor the scrollbar
2009-11-11 17:14:32 -08:00
Grace Kloba
48fc437f6d am d7439f4b: Use computeVerticalScrollRange() to find the bottom of the page as mContentHeight is not in the view system.
Merge commit 'd7439f4bdb31d005011b69112e82a9fed9be4470' into eclair-mr2

* commit 'd7439f4bdb31d005011b69112e82a9fed9be4470':
  Use computeVerticalScrollRange() to find the bottom
2009-11-11 17:14:10 -08:00
Grace Kloba
62b1ad30b3 am c9966891: Merge change Ibb245ea7 into eclair
Merge commit 'c996689109b1ac0849aa675e1987e3851ee77a95' into eclair-mr2

* commit 'c996689109b1ac0849aa675e1987e3851ee77a95':
  Return an empty PluginList instead of null for the
2009-11-11 17:13:57 -08:00
Jim Miller
2dace9a115 am 2f92bd3e: Merge change Ia895aa7d into eclair
Merge commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b' into eclair-mr2

* commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b':
  Fix for 2209086:  Initial pass at new SlidingTab widget and integration into LockScreen.
2009-11-11 17:13:17 -08:00
Wink Saville
742e208e71 am 38210df3: Merge change I326c1f7e into eclair
Merge commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0' into eclair-mr2

* commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0':
  Throttle nitz updates as the are too numerous on cdma.
2009-11-11 17:12:58 -08:00
Gilles Duboscq
33987d67db am 9d9dda53: Merge change Ia629e0f8 into eclair
Merge commit '9d9dda53f894eb776c9cec38bd8c98652a1c0697' into eclair-mr2

* commit '9d9dda53f894eb776c9cec38bd8c98652a1c0697':
  Make multipart message follow 3GPP TS 23.040 V9.0.0 (2009-06), section 9.2.3.24.1 :
2009-11-11 17:12:42 -08:00
Dianne Hackborn
8390240253 am 250aa068: Merge change Idf7fafd3 into eclair
Merge commit '250aa068eae7424d454fc65ea83c8a65ca717112' into eclair-mr2

* commit '250aa068eae7424d454fc65ea83c8a65ca717112':
  Fix issue #2248951: Need to turn off touch filtering outside of sholes
2009-11-11 17:12:28 -08:00
Daisuke Miyakawa
f63f240388 am b9c40a65: (-s ours) Merge change I5d30aa18 into eclair
Merge commit 'b9c40a65c7fb2121d3076a522248574162bf5f8c' into eclair-mr2

* commit 'b9c40a65c7fb2121d3076a522248574162bf5f8c':
  Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.
2009-11-11 17:10:58 -08:00
Daisuke Miyakawa
77a713968d am e464de6b: (-s ours) Make vCard exporter check invalid phone numbers and re-format them if needed. Do not merge.
Merge commit 'e464de6b764348a102ae64417d22bbd1c80723dc' into eclair-mr2

* commit 'e464de6b764348a102ae64417d22bbd1c80723dc':
  Make vCard exporter check invalid phone numbers and re-format them if needed. Do not merge.
2009-11-11 17:10:36 -08:00
Dave Sparks
fb7b7619cd am dd861689: Merge change I05fd0df0 into eclair
Merge commit 'dd861689924198ed22115f0e21be1b81e159a7cc' into eclair-mr2

* commit 'dd861689924198ed22115f0e21be1b81e159a7cc':
  Fix potential deadlock in stopPreview/stopRecord.
2009-11-11 17:10:03 -08:00
Daisuke Miyakawa
eb378d7fd8 am fe17db4c: (-s ours) Merge change I4db11d50 into eclair
Merge commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9' into eclair-mr2

* commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9':
  Backport the change I30b141a2 from MR2 to MR1. Do not merge.
2009-11-11 17:09:39 -08:00
Android (Google) Code Review
5eca943b97 Merge change I735f4553 into eclair-mr2
* changes:
  resolved conflicts for merge of ae0cf6dc to eclair-mr2
2009-11-11 17:00:23 -08:00
Fred Quintana
44888afd89 resolved conflicts for merge of ae0cf6dc to eclair-mr2 2009-11-11 16:18:46 -08:00
Android (Google) Code Review
295fb83735 Merge change I5975651f into eclair
* changes:
  Don't feed the timezone to RenderScript time functions, let the library figure it out.
2009-11-11 15:37:37 -08:00
Android (Google) Code Review
6c510e0d90 Merge change I7b8b6cfb into eclair
* changes:
  Do not force screen on when undocking from the desk dock.
2009-11-11 15:36:18 -08:00
Android (Google) Code Review
13937c3bc5 Merge change Icc48b1e7 into eclair
* changes:
  don't request a sync when temp providers are created
2009-11-11 15:15:55 -08:00
Android (Google) Code Review
8391b8f88c Merge change Ibb245ea7 into eclair
* changes:
  Return an empty PluginList instead of null for the deprecated getPluginList() api.
2009-11-11 14:34:05 -08:00
Android (Google) Code Review
2a76abf35c Merge change Ia895aa7d into eclair
* changes:
  Fix for 2209086:  Initial pass at new SlidingTab widget and integration into LockScreen.
2009-11-11 14:02:00 -08:00
Android (Google) Code Review
6da322d5af Merge change I326c1f7e into eclair
* changes:
  Throttle nitz updates as the are too numerous on cdma.
2009-11-11 12:46:22 -08:00
Android (Google) Code Review
a2c27de457 Merge change Ia629e0f8 into eclair
* changes:
  Make multipart message follow 3GPP TS 23.040 V9.0.0 (2009-06), section 9.2.3.24.1 : all the parts should have the same encoding.
2009-11-11 11:53:06 -08:00
Android (Google) Code Review
0b79b3cf22 Merge change Idf7fafd3 into eclair
* changes:
  Fix issue #2248951: Need to turn off touch filtering outside of sholes
2009-11-11 10:54:58 -08:00
Lixin Yue
f16a6ae9c0 am 971af003: Merge change I65208317 into eclair
Merge commit '971af0030568ba25a83788506a3f29bc9f1cd10d' into eclair-mr2

* commit '971af0030568ba25a83788506a3f29bc9f1cd10d':
  Update OBEX to fix missing several contact entries issue.
2009-11-11 09:58:51 -08:00
Dianne Hackborn
c391092b44 am 48515f49: Merge change I0de7979b into eclair
Merge commit '48515f495b29c01b473579825d5ba5e690ff5db7' into eclair-mr2

* commit '48515f495b29c01b473579825d5ba5e690ff5db7':
  Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
2009-11-11 09:58:38 -08:00
Android (Google) Code Review
d7c1513bda Merge change I5d30aa18 into eclair
* changes:
  Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.
2009-11-10 23:03:57 -08:00
Android (Google) Code Review
123e7e712a Merge change I05fd0df0 into eclair
* changes:
  Fix potential deadlock in stopPreview/stopRecord.
2009-11-10 22:29:59 -08:00
Android (Google) Code Review
ea3ba43a3e Merge change I4db11d50 into eclair
* changes:
  Backport the change I30b141a2 from MR2 to MR1. Do not merge.
2009-11-10 22:03:20 -08:00
Android (Google) Code Review
de944d4dc6 Merge change I1179efbb into eclair-mr2
* changes:
  resolved conflicts for merge of ba56915a to eclair-mr2
2009-11-10 18:03:35 -08:00
Jack Palevich
de467d1069 resolved conflicts for merge of ba56915a to eclair-mr2 2009-11-11 10:01:46 +08:00
Dave Sparks
ff0f38e6fe Fix potential deadlock in stopPreview/stopRecord.
Some camera HALs spin up a preview thread and need to wait for
the thread to exit. This can create a potential deadlock. In
stopPreview, we take the main lock. If a preview callback occurs
while the lock is held, the preview thread will block. If the
camera HAL is waiting for the preview thread to exit, this will
cause a deadlock.

This patch breaks out the preview buffer heap into a separate
mutex. This mutex is never held when the main lock is held, thus
preventing the deadlock from occuring.
2009-11-10 17:08:08 -08:00
Android (Google) Code Review
3bde289d23 Merge change I50986dd4 into eclair
* changes:
  Make the RegisteredSErvices Cache not allow the registered service for a type to change without first uninstalling the previous service for that type, unless the newly installed service is in the system image.
2009-11-10 16:53:43 -08:00
Android (Google) Code Review
f5aab38201 Merge change I65208317 into eclair
* changes:
  Update OBEX to fix missing several contact entries issue.
2009-11-10 16:36:40 -08:00
Android (Google) Code Review
9851e52fb4 Merge change I0de7979b into eclair
* changes:
  Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
2009-11-10 15:27:36 -08:00
Android (Google) Code Review
ec63c280ea Merge change Ie806ae6f into eclair
* changes:
  Fix multi-lock ordering issues in GLSurfaceView
2009-11-10 15:21:28 -08:00
Andreas Huber
d57da93539 am cfe45c77: Merge change I96c4d4b3 into eclair
Merge commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8' into eclair-mr2

* commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8':
  Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
2009-11-10 12:29:34 -08:00
Android (Google) Code Review
7e8135a28c Merge change I96c4d4b3 into eclair
* changes:
  Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
2009-11-10 12:27:53 -08:00
Mike Lockwood
a2eda9309f am cc9a63db: Add support for specifying the current LCD brightness mode to the backlight driver.
Merge commit 'cc9a63dbc2b5569ef65ec3a04d86dbdfdee3f134' into eclair-mr2

* commit 'cc9a63dbc2b5569ef65ec3a04d86dbdfdee3f134':
  Add support for specifying the current LCD brightness mode to the backlight driver.
2009-11-10 12:03:10 -08:00
Android (Google) Code Review
118cedc4a5 Merge change I3e1bdd38 into eclair-mr2
* changes:
  Transcode files again.
2009-11-10 11:53:19 -08:00
Dianne Hackborn
7ffc876b74 am 119a7675: Merge change I83ba96fe into eclair
Merge commit '119a767565399809d222ddda6392e5e58942d5e6' into eclair-mr2

* commit '119a767565399809d222ddda6392e5e58942d5e6':
  Fix issue #2246723: Only one Application object gets onCreate called
2009-11-10 10:52:51 -08:00
Android (Google) Code Review
e47f670e55 Merge change I83ba96fe into eclair
* changes:
  Fix issue #2246723: Only one Application object gets onCreate called
2009-11-10 10:27:05 -08:00
Gloria Wang
d2424ab0f5 am bf964e6a: Merge change Ic060d86f into eclair
Merge commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e' into eclair-mr2

* commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e':
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:07:10 -08:00
Android (Google) Code Review
4df9b8c64c Merge change Ic060d86f into eclair
* changes:
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:04:40 -08:00
Scott Main
d42ca87259 am 13ce56bd: am 88427cff: Merge change Ibcfb7d10 into eclair-sdk
Merge commit '13ce56bdbc4872c0b12caff501e063f5a75073db' into eclair-mr2

* commit '13ce56bdbc4872c0b12caff501e063f5a75073db':
  docs: add more documentation for the bluetooth apis.
2009-11-10 09:40:48 -08:00
Dirk Dougherty
9da6e65019 am 84241293: am 3a103a87: Merge change I15536f3c into eclair-sdk
Merge commit '84241293129423a1ebd7261e8139cfb20049535f' into eclair-mr2

* commit '84241293129423a1ebd7261e8139cfb20049535f':
  doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
2009-11-10 09:38:47 -08:00