3553 Commits

Author SHA1 Message Date
Steve Block
478ac27782 am b84138c7: Merge change 23806 into eclair
Merge commit 'b84138c72c94f189d4656451097b90f86d751731' into eclair-plus-aosp

* commit 'b84138c72c94f189d4656451097b90f86d751731':
  Handle security exception when Geolocation registers with system location service in DumpRenderTree.
2009-09-03 09:26:05 -07:00
Android (Google) Code Review
b84138c72c Merge change 23806 into eclair
* changes:
  Handle security exception when Geolocation registers with system location service in DumpRenderTree.
2009-09-03 09:24:15 -07:00
Daniel Sandler
7a1140ee89 am 47cec9fa: Merge change 23817 into eclair
Merge commit '47cec9fafbef30b817ac0a8af510ac35e09ea966' into eclair-plus-aosp

* commit '47cec9fafbef30b817ac0a8af510ac35e09ea966':
  Fix http://b/issue?id=2096107 (cosmetic issue for menus in WVGA)
2009-09-03 08:51:35 -07:00
Daniel Sandler
0824096822 Fix http://b/issue?id=2096107 (cosmetic issue for menus in WVGA)
The divider 9-patch was rendered quite wrongly.  I repaired it to remove the
gap described in the bug report, as well as to match color with the horizontal
divider (divider_horizontal_bright.9.png).
2009-09-03 11:46:06 -04:00
Steve Block
4afcd2e9d6 Handle security exception when Geolocation registers with system location service in DumpRenderTree. 2009-09-03 12:02:20 +01:00
Dianne Hackborn
f6d2ccc19f am 85644d78: Really fix issue #:2097189 can\'t set custom wallpaper
Merge commit '85644d78894b66fa2903fb012b5122185767d1c5' into eclair-plus-aosp

* commit '85644d78894b66fa2903fb012b5122185767d1c5':
  Really fix issue #:2097189 can't set custom wallpaper
2009-09-03 00:29:09 -07:00
Dianne Hackborn
85644d7889 Really fix issue #:2097189 can't set custom wallpaper
Change-Id: Id0775b6c6716775c5da6f4fadf696571019279cc
2009-09-03 00:23:04 -07:00
Jeff Sharkey
bc0f52ea0b am 0c36a517: Add private API for data with presence.
Merge commit '0c36a517cd01a7112460a96f9f0fa2badf8f7015' into eclair-plus-aosp

* commit '0c36a517cd01a7112460a96f9f0fa2badf8f7015':
  Add private API for data with presence.
2009-09-02 23:20:48 -07:00
Jeff Sharkey
0c36a517cd Add private API for data with presence. 2009-09-02 23:16:44 -07:00
Dianne Hackborn
83c36fcbd4 am 3bb9c6d1: Merge change 23774 into eclair
Merge commit '3bb9c6d1f5b252dc3ed7eb069ff5aeabd2b02548' into eclair-plus-aosp

* commit '3bb9c6d1f5b252dc3ed7eb069ff5aeabd2b02548':
  Fix issue #2097189: can't set custom wallpaper
2009-09-02 22:47:42 -07:00
Dianne Hackborn
5e802fbb89 Fix issue #2097189: can't set custom wallpaper
My deadlock fix was only half done.

Change-Id: If9f286030894a60cd71851fb784bb61045f08185
2009-09-02 21:53:30 -07:00
Tammo Spalink
8521dca69b am fb16e5cc: Merge change 23607 into eclair
Merge commit 'fb16e5ccdb230a11cbbbfd17d323db7b88395c2f' into eclair-plus-aosp

* commit 'fb16e5ccdb230a11cbbbfd17d323db7b88395c2f':
  Reject (NAK) CDMA SMS with unknown teleservice ids.
2009-09-02 20:30:43 -07:00
Android (Google) Code Review
fb16e5ccdb Merge change 23607 into eclair
* changes:
  Reject (NAK) CDMA SMS with unknown teleservice ids.
2009-09-02 20:29:09 -07:00
Dmitri Plotnikov
9d6783e774 am 622da682: Merge change 23765 into eclair
Merge commit '622da6829f11f0cacdbd6fe3b58f230d98115ed5' into eclair-plus-aosp

* commit '622da6829f11f0cacdbd6fe3b58f230d98115ed5':
  [Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI
2009-09-02 20:24:04 -07:00
Dmitri Plotnikov
ceb7979636 [Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI 2009-09-02 19:13:58 -07:00
Dianne Hackborn
401ab1058a am 6e478d7a: Merge change 23751 into eclair
Merge commit '6e478d7afb33eff4efe704a16b1a05435b431062' into eclair-plus-aosp

* commit '6e478d7afb33eff4efe704a16b1a05435b431062':
  Fix deadlock in wallpaper.
2009-09-02 18:20:52 -07:00
Dianne Hackborn
0250416a8f am 78c951b2: Merge change 23704 into eclair
Merge commit '78c951b286ad6fc5300e2d30a624b7e9963202e7' into eclair-plus-aosp

* commit '78c951b286ad6fc5300e2d30a624b7e9963202e7':
  Fiddle system boot ordering.
2009-09-02 17:57:49 -07:00
Dianne Hackborn
840c3a2b7e Fix deadlock in wallpaper.
Change-Id: I9ab5681ebf325a9e33ca4b59a8581e535e4dde54
2009-09-02 17:56:50 -07:00
Android (Google) Code Review
78c951b286 Merge change 23704 into eclair
* changes:
  Fiddle system boot ordering.
2009-09-02 17:55:35 -07:00
Christian Sonntag
a9ef0e8891 am ea6fca82: fix doc
Merge commit 'ea6fca8231c94064917e40dea23be8df50930cf9' into eclair-plus-aosp

* commit 'ea6fca8231c94064917e40dea23be8df50930cf9':
  fix doc
2009-09-02 17:40:51 -07:00
Dianne Hackborn
a34f1ad7c3 Fiddle system boot ordering.
This makes the system a little more careful to not start third party
code until it is ready to.

Also fix a little bug in SyncManager that would cause it to crash
during boot if sync was in a failure state.

Change-Id: Ib2d287d8441d155d393fe740a5f98690895fd358
2009-09-02 17:39:54 -07:00
Christian Sonntag
ea6fca8231 fix doc 2009-09-02 17:34:48 -07:00
Christian Sonntag
6564e20809 am 75f1d43b: Merge change 23738 into eclair
Merge commit '75f1d43b64cbf4b68ad62919a0c58907933ccd59' into eclair-plus-aosp

* commit '75f1d43b64cbf4b68ad62919a0c58907933ccd59':
  fix doc
2009-09-02 17:27:36 -07:00
Android (Google) Code Review
75f1d43b64 Merge change 23738 into eclair
* changes:
  fix doc
2009-09-02 17:25:35 -07:00
Christian Sonntag
a9b1a7f6c0 fix doc 2009-09-02 17:23:56 -07:00
Fred Quintana
61f87bcbd6 am 14de0880: Merge change 23698 into eclair
Merge commit '14de0880dd7b716f39b822917e874ca5e579ff37' into eclair-plus-aosp

* commit '14de0880dd7b716f39b822917e874ca5e579ff37':
  suppress syncs until boot is complete
2009-09-02 17:07:35 -07:00
Android (Google) Code Review
14de0880dd Merge change 23698 into eclair
* changes:
  suppress syncs until boot is complete
2009-09-02 16:50:13 -07:00
Leon Scroggins
cf4fe3efaa am f6ca7fab: Merge change 23690 into eclair
Merge commit 'f6ca7fab5043e1c3e834c15b4e674ae0c5c37d0d' into eclair-plus-aosp

* commit 'f6ca7fab5043e1c3e834c15b4e674ae0c5c37d0d':
  Prevent a crash when webkit changes the selection.
2009-09-02 16:47:20 -07:00
Grace Kloba
449d42c9ac am 010bed74: Merge change 23723 into eclair
Merge commit '010bed7419e96f5310be25d9317405d360f90b9c' into eclair-plus-aosp

* commit '010bed7419e96f5310be25d9317405d360f90b9c':
  Get drawable directory for the platform buttons.
2009-09-02 16:47:14 -07:00
Android (Google) Code Review
f6ca7fab50 Merge change 23690 into eclair
* changes:
  Prevent a crash when webkit changes the selection.
2009-09-02 16:45:33 -07:00
Android (Google) Code Review
010bed7419 Merge change 23723 into eclair
* changes:
  Get drawable directory for the platform buttons.
2009-09-02 16:44:52 -07:00
Leon Scroggins
ef92e7a606 Prevent a crash when webkit changes the selection.
Partial fix for http://b/issue?id=2081673
This prevents a crash.  However, if the user continues typing
into the textfield, the selection is incorrect.  The real solution
(forthcoming), will make sure that the WebTextView's text gets
updated when webkit updates.

Change-Id: Ic832ec48fd4236c8116c5cbda1467677ad731feb
2009-09-02 19:31:33 -04:00
Suchi Amalapurapu
743a7495ab am 23db1731: Merge change 23717 into eclair
Merge commit '23db17314d32b56727123d21e3ca899a441c2a60' into eclair-plus-aosp

* commit '23db17314d32b56727123d21e3ca899a441c2a60':
  Make new attribute EXTRA_CHANGED_COMPONENT_NAME in
2009-09-02 16:26:48 -07:00
Android (Google) Code Review
23db17314d Merge change 23717 into eclair
* changes:
  Make new attribute EXTRA_CHANGED_COMPONENT_NAME in broadcast intent ACTION_PACKAGE_CHANGED public so that apps like launcher can find out the changed component name when loading changes made in components.
2009-09-02 16:25:01 -07:00
Grace Kloba
83031581d6 Get drawable directory for the platform buttons.
Fix http://b/issue?id=2086818
2009-09-02 16:21:42 -07:00
Suchi Amalapurapu
32f589046b Make new attribute EXTRA_CHANGED_COMPONENT_NAME in
broadcast intent ACTION_PACKAGE_CHANGED public so that
apps like launcher can find out the changed component name
when loading changes made in components.
2009-09-02 16:11:14 -07:00
Nick Pelly
a457a5dbb9 am d4c1baf9: Merge change 23646 into eclair
Merge commit 'd4c1baf93708ad4e90c556e6041a498dbffaaba0' into eclair-plus-aosp

* commit 'd4c1baf93708ad4e90c556e6041a498dbffaaba0':
  Immediately destroy BluetoothSocket's on close().
2009-09-02 16:03:31 -07:00
Android (Google) Code Review
d4c1baf937 Merge change 23646 into eclair
* changes:
  Immediately destroy BluetoothSocket's on close().
2009-09-02 16:01:15 -07:00
Fred Quintana
4f9cfc5c52 suppress syncs until boot is complete 2009-09-02 15:20:23 -07:00
Cedric Beust
7def92e2f1 am 04e1faf0: Merge change 23669 into eclair
Merge commit '04e1faf0f030ddb360180289fb798adbb3348dd4' into eclair-plus-aosp

* commit '04e1faf0f030ddb360180289fb798adbb3348dd4':
  Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
2009-09-02 13:36:26 -07:00
Android (Google) Code Review
04e1faf0f0 Merge change 23669 into eclair
* changes:
  Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
2009-09-02 13:33:43 -07:00
Cedric Beust
a010ef4d7e Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
Change-Id: I154e27f615932bfcc08993aa361a6d2ffbc51d74
2009-09-02 13:24:52 -07:00
Cedric Beust
286996b26e am 682e30a8: Merge change 23667 into eclair
Merge commit '682e30a894bfe9600f5c216c008ec4fe26c3b954' into eclair-plus-aosp

* commit '682e30a894bfe9600f5c216c008ec4fe26c3b954':
  Fix the -1 unread count bug.
2009-09-02 13:18:41 -07:00
Android (Google) Code Review
682e30a894 Merge change 23667 into eclair
* changes:
  Fix the -1 unread count bug.
2009-09-02 13:15:52 -07:00
Cedric Beust
6f4a8a5861 Fix the -1 unread count bug.
Change-Id: I8b77ad3457504872928c1065d54f50c0618025b5
2009-09-02 13:12:26 -07:00
jsh
ffaa502e78 am 8ecd2aec: Merge change 23548 into eclair
Merge commit '8ecd2aecf66010e974d9125f40282168be76b440' into eclair-plus-aosp

* commit '8ecd2aecf66010e974d9125f40282168be76b440':
  Fix some sign in errors.
2009-09-02 13:05:05 -07:00
Android (Google) Code Review
8ecd2aecf6 Merge change 23548 into eclair
* changes:
  Fix some sign in errors.
2009-09-02 13:01:59 -07:00
Jeff Hamilton
baccdec934 am 0a299858: Merge change 23643 into eclair
Merge commit '0a29985895069cc7a34d5511a292d779eae36426' into eclair-plus-aosp

* commit '0a29985895069cc7a34d5511a292d779eae36426':
  Don't crash when a user taps on a fast track trigger that isn't hooked up to a contact.
2009-09-02 12:40:44 -07:00
Suchi Amalapurapu
2d18a24c93 am beea2690: Merge change 23323 into eclair
Merge commit 'beea2690008eaea5a901ff3ae748b01893e24e1b' into eclair-plus-aosp

* commit 'beea2690008eaea5a901ff3ae748b01893e24e1b':
  For intent ACTION_PACKAGE_CHANGED, there could be a lot of broadcasts related to enabling/disabling
2009-09-02 12:40:39 -07:00
Android (Google) Code Review
0a29985895 Merge change 23643 into eclair
* changes:
  Don't crash when a user taps on a fast track trigger that isn't hooked up to a contact.
2009-09-02 12:38:03 -07:00