Commit Graph

16870 Commits

Author SHA1 Message Date
Adam Powell
42364be58b am b7e23dbe: am 37f4f5b1: am d135f74b: am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke() 2010-05-05 11:07:30 -07:00
Jaikumar Ganesh
fe95e9a564 am fb50b1ce: am 55b0110f: Fix runtime reboot when connecting to a A2DP headset and user toggles BT state. 2010-05-05 11:07:25 -07:00
Scott Main
e446174b98 am d582694c: am ebad36db: am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo 2010-05-05 11:06:58 -07:00
Brian Carlstrom
a4252e8351 Merge "Remove explicit SSLSocket.startHandshake" 2010-05-05 10:47:13 -07:00
Brian Carlstrom
e103355d93 Remove explicit SSLSocket.startHandshake
When dalvik-dev merges to master, startHandshake will imply that
    the caller wants a fully synchronous handshake instead of using
    handshake cutthrough. This removes an unnecessary startHandshake
    from the CertificateChainValidator.

    	core/java/android/net/http/CertificateChainValidator.java

Change-Id: Ie28abd961a06b28fa780d62b0063371ef4dc1eec
2010-05-05 10:18:04 -07:00
Jean-Michel Trivi
13b18fd7f9 Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
sound.
This CL doesn't fix why mView can be null in the first place, but
prevents a crash when mView is null and a UI sound is to be played.

Change-Id: I74ea03567e8e6ebebb6c95c80a473abf11e1163d
2010-05-05 09:37:41 -07:00
Daisuke Miyakawa
5763c1f501 Call register_localized_collators() with the current locale.
Make JNI function for setLocale() call register_localized_collators()
with the current locale, not previous one, every time it is possible.

This is a partial cherry-pick of b945639d0c

BUG: 2514026
Change-Id: I584f1f68814dc084e699714e9d14a034123b49da
2010-05-05 09:01:48 -07:00
Steve Block
fe66eef15c Merge "Roll back the update to the WebKit UA string" 2010-05-05 07:28:37 -07:00
Dianne Hackborn
d9d009d721 am 3445dae3: am 65b2561c: Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo
Merge commit '3445dae3f52fa8421e3b93496ac93c5753a43bd2' into kraken

* commit '3445dae3f52fa8421e3b93496ac93c5753a43bd2':
  Fix issue #2643754: Launcher is caching widget layouts for too long
2010-05-04 18:30:51 -07:00
Bjorn Bringert
b6179a7069 am 0c698e6e: am c9dc1090: Merge "Build searchables list after boot" into froyo
Merge commit '0c698e6e78a897d9ad14d802ccff2f2bda15b14b' into kraken

* commit '0c698e6e78a897d9ad14d802ccff2f2bda15b14b':
  Build searchables list after boot
2010-05-04 18:30:47 -07:00
Dianne Hackborn
3445dae3f5 am 65b2561c: Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo
Merge commit '65b2561c3bd74b639df0fead2041c775b7f40000' into froyo-plus-aosp

* commit '65b2561c3bd74b639df0fead2041c775b7f40000':
  Fix issue #2643754: Launcher is caching widget layouts for too long
2010-05-04 18:22:39 -07:00
Bjorn Bringert
0c698e6e78 am c9dc1090: Merge "Build searchables list after boot" into froyo
Merge commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf' into froyo-plus-aosp

* commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf':
  Build searchables list after boot
2010-05-04 18:22:36 -07:00
Daniel Sandler
5748ab3d8d am 59bfdab3: am f24e66db: am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo 2010-05-04 17:46:19 -07:00
Joe Onorato
7604f54733 am 6cb9d189: am 07779ac1: am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated. 2010-05-04 17:46:05 -07:00
Dianne Hackborn
65b2561c3b Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo 2010-05-04 17:43:25 -07:00
Dianne Hackborn
4416c3d6e4 Fix issue #2643754: Launcher is caching widget layouts for too long
With the .apk file names now changing during an update, we need
to make sure to flush all caches related to a package when the
package is removed.  Otherwise we can continue to use the old
package, since its old file may still exist if we try to load it
too soon.

Change-Id: I15f08dffca3feac999dbca4f24bef12a30ca0a66
2010-05-04 17:22:49 -07:00
Bjorn Bringert
c9dc10908a Merge "Build searchables list after boot" into froyo 2010-05-04 16:57:56 -07:00
Jaikumar Ganesh
94278c9fd2 Add UUID property for adapter.
4.64 version of Bluez has the UUID property of adapter being reported.

Change-Id: Ibf451a14d58620ba8bea812cd302be0b4def5f74
2010-05-04 15:57:50 -07:00
Jaikumar Ganesh
c0cec62454 Fix runtime reboot when connecting to a A2DP headset and
user toggles BT state.

Bug:2607218

This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.

Change-Id: Icf0abeb3dfc794bb3371b1c427aa15755fbe84c7
2010-05-04 15:56:11 -07:00
Jaikumar Ganesh
ca4d4de865 Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken 2010-05-04 15:53:31 -07:00
Jaikumar Ganesh
9997f66f62 Revert "Fix runtime reboot when connecting to a A2DP headset and"
This reverts commit 55b0110fc2.
2010-05-04 15:52:42 -07:00
Bjorn Bringert
2c7b197a4a Build searchables list after boot
This avoids delaying the first launch of QuickSearchBox or Browser
after boot while SearchManagerService builds the searchables list.

Bug http://b/issue?id=2639863

Change-Id: Ia510204691ecf487a2008723fe8f6caaced86618
2010-05-04 23:49:24 +01:00
Adam Powell
37f4f5b1ea am d135f74b: am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Merge commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d' into kraken

* commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d':
  Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:41:41 -07:00
Adam Powell
d135f74b97 am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Merge commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6' into froyo-plus-aosp

* commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6':
  Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:40:36 -07:00
Jaikumar Ganesh
55b0110fc2 Fix runtime reboot when connecting to a A2DP headset and
user toggles BT state.

Bug:2607218

This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.

Change-Id: I023406ec6d59880754ca4f1de676d0dce71b13c6
2010-05-04 15:28:27 -07:00
Jean-Baptiste Queru
f32cdca3cf Merge "Fix for bug 2467152 files with spaces fail to open." 2010-05-04 15:16:32 -07:00
Adam Powell
151af19bf4 Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Change-Id: I841a37349fbc6af33073aaecae903eb8999cc5bd
2010-05-04 14:44:45 -07:00
Scott Main
ebad36db56 am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
Merge commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3' into kraken

* commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3':
  docs: revise and add documentation for backup APIs
2010-05-04 14:22:47 -07:00
Scott Main
5c16039adf am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
Merge commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942' into froyo-plus-aosp

* commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942':
  docs: revise and add documentation for backup APIs
2010-05-04 14:21:21 -07:00
Scott Main
014517569f Merge "docs: revise and add documentation for backup APIs" into froyo 2010-05-04 14:20:02 -07:00
Valentin Kravtsov
2b0c7ab689 Fixing: RecognitionService logcat spam "cancel called..."
Bug fix for: http://b/issue?id=2647644

RecognitionService logcat spam "cancel called with no preceding startListening - ignoring"

Change-Id: I1da8b4d40406929ed0225d40cfac629507e71c7e
2010-05-04 20:53:52 +01:00
Daniel Sandler
f24e66dbb9 am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
Merge commit '342a3800b9b31929b337d298a24184d820f27f26' into kraken

* commit '342a3800b9b31929b337d298a24184d820f27f26':
  Increase the row height of menus by 1dip.
2010-05-04 12:45:53 -07:00
Joe Onorato
07779ac16e am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated.
Merge commit '77da7312215c4a433e3f53c2fe306307fc3bad52' into kraken

* commit '77da7312215c4a433e3f53c2fe306307fc3bad52':
  Call into app widget hosts when the provider is updated.
2010-05-04 12:45:44 -07:00
Daniel Sandler
342a3800b9 am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
Merge commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502' into froyo-plus-aosp

* commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502':
  Increase the row height of menus by 1dip.
2010-05-04 12:42:48 -07:00
Daniel Sandler
70c6bb0d3e Merge "Increase the row height of menus by 1dip." into froyo 2010-05-04 12:40:54 -07:00
Joe Onorato
77da731221 am f140be6c: Call into app widget hosts when the provider is updated.
Merge commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04' into froyo-plus-aosp

* commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04':
  Call into app widget hosts when the provider is updated.
2010-05-04 12:37:59 -07:00
Joe Onorato
f140be6c3c Call into app widget hosts when the provider is updated.
Change-Id: If0a2459901e88cf04810b23178e4673d44fa69cc
2010-05-04 11:49:12 -07:00
Nicholas Killewald
0ba2d4782c Fixed deserialization problem in DatePicker.
During onRestoreInstanceState for DatePicker, the internal
state of the widget is restored properly (thus setting the
internal year, month, and day), but the spinners aren't
visually updated to that state immediately. That is to say,
the internal state of the widget doesn't match the spinners
in that case, which can cause confusion.

Change-Id: I96d1a299d0ee159d41450470acb30a3bf6006d44
2010-05-04 11:48:22 -07:00
Daniel Sandler
5d0ef0d90a Increase the row height of menus by 1dip.
This prevents CJK characters, which have extra-tall
ascenders, from being clipped by the drawable in
IconMenuItemView.

Bug: 2330380
Change-Id: I1256b85122e1634d5220c648111a5ffe43879f1f
2010-05-04 14:33:28 -04:00
Leon Clarke
b4f6b2114c Don't load prefetch requests when roaming 2010-05-04 10:59:51 +01:00
Gilles Debunne
76f0ce1fe4 Revert "Merge "Raw types warnings removed.""
This reverts commit 9794ca60d7, reversing
changes made to d3f9051c85.

Change-Id: I39cebc7e92d3604941d66b09bd7b899d06f703fb
2010-05-03 18:51:28 -07:00
Paul Westbrook
0564f06947 Merge "Fix Gmail unit test" 2010-05-03 16:30:43 -07:00
The Android Open Source Project
8bede19e88 am facad955: am dcb5f18f: am 007ad770: merge from open-source master 2010-05-03 16:28:29 -07:00
The Android Open Source Project
dcb5f18fd6 am 007ad770: merge from open-source master
Merge commit '007ad7700a23ff7e618cfeee1eab97063c93b800' into kraken

* commit '007ad7700a23ff7e618cfeee1eab97063c93b800':
  Adapt to new location of libcore
  Parse custom text header and ignore it.
  Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
  'uses-library' was not working for persistent applications.
  Fix an NPE in InputMethodService when mExtractAction is null.
2010-05-03 16:25:15 -07:00
The Android Open Source Project
007ad7700a merge from open-source master
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
2010-05-03 16:19:31 -07:00
Gilles Debunne
9794ca60d7 Merge "Raw types warnings removed." 2010-05-03 16:03:55 -07:00
Paul Westbrook
6d3564e7d6 Fix Gmail unit test
Fix a NPE where, while running the unit tests, a download
is not found

Change-Id: I7c407112e5cfe7c39ceace25c48c6eba4f5dcfbe
2010-05-03 15:36:45 -07:00
Erik
d3f9051c85 Merge "Added access fields for second timezone columns." 2010-05-03 13:53:21 -07:00
Vasu Nori
9463f297ef sometimes database lock is not held before compiling a statement
indirectly uncovered by bug:2631971

Change-Id: I71059b6b62bc21612fc98689aefd4534884c8e7c
2010-05-03 12:24:20 -07:00
Erik
c07b06f12a Added access fields for second timezone columns.
This adds public access to DTSTART2, DTEND2, and EVENT_TIMEZONE2. These are being used
for work on allDay events.

Change-Id: I5b10eff08e2e61a71bf628ddea70dfb201a5c2b3
2010-05-03 11:40:35 -07:00