Commit Graph

23140 Commits

Author SHA1 Message Date
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
Steve Block
fe66eef15c Merge "Roll back the update to the WebKit UA string" 2010-05-05 07:28:37 -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
Dan Morrill
da3ae8c193 am 69a07917: am 6a22fb9b: am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 2010-05-04 17:46:13 -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
Joe Malin
384abb1fbe Merge "Doc Change: Activity Testing/Hello, Testing tutorials doc files Change-ID: bddebe3eaaf722e2bd2a56d473b76a0a8e061053 Author: Joe Malin <jmalin@google.com> Date: Mon Mar 1 18:24:14 2010 -0800" 2010-05-04 16:16:24 -07:00
Shimeng (Simon) Wang
475cfa74a0 Merge "Remove svg from ignored rendertree tests list." 2010-05-04 13:53:48 -07:00
Shimeng (Simon) Wang
aba9160183 Remove svg from ignored rendertree tests list.
issue: 2469786
Change-Id: I9e7264a32fbc50d6810031b32ef0da411904cd83
2010-05-04 13:51:52 -07:00
Jake Hamby
9e397775e1 Fix Javadoc param tags and typo in private constant definition.
- Two Javadoc comments in telephony/cdma/SmsMessage.java had the wrong parameter name in @param.
- Typo in private constant defined in telephony/cdma/sms/BearerData.java.

Change-Id: I3c210383f74a5fef022e0958ab56ef9b7be8e97c
2010-05-04 13:35:55 -07:00
Jake Hamby
bcd573229e Fix some more typos, remove unused imports, and remove unnecessary cast.
More minor code cleanups in the telephony framework.

Change-Id: I27abe11e02fc6fea12885eea4fe275240a546332
2010-05-04 13:31:04 -07:00
Jake Hamby
43a869f3ad Fix some typos and move two .java files to the correct package directory.
- Fix typos in comments in TelephonyProperties.java
- Move two .java files in telephonytests to the correct package directory.

Change-Id: Ie69da31c128899d149d4f5d5aababe8d017d8f18
2010-05-04 12:59:46 -07:00
Daniel Sandler
59bfdab355 am f24e66db: am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo 2010-05-04 12:55:03 -07:00
Dan Morrill
69a0791779 am 6a22fb9b: am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 2010-05-04 12:54:58 -07:00
Joe Onorato
6cb9d189a8 am 07779ac1: am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated. 2010-05-04 12:54:54 -07:00
Jake Hamby
4103214f8d Merge "Fix a few more Javadoc typos." 2010-05-04 12:52:33 -07: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
Dan Morrill
6a22fb9bef am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken

* commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9':
  Adding the backward-compatible filtering heuristics for the new device
2010-05-04 12:45:49 -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
Dan Morrill
f7ebcfeccb am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
Merge commit 'e17b4e711571198f79c0c2bad3656d58c63629e8' into froyo-plus-aosp

* commit 'e17b4e711571198f79c0c2bad3656d58c63629e8':
  Adding the backward-compatible filtering heuristics for the new device
2010-05-04 12:38:03 -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 Malin
e52c4a7823 Doc Change: Activity Testing/Hello, Testing tutorials doc files
Change-ID: bddebe3eaaf722e2bd2a56d473b76a0a8e061053
Author: Joe Malin <jmalin@google.com>
Date:   Mon Mar 1 18:24:14 2010 -0800
2010-05-04 12:23:33 -07:00
Dan Morrill
e17b4e7115 Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 2010-05-04 12:03:45 -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
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
The Android Open Source Project
6ce8b0ad27 am 4929e5a5: am e4b9834f: am 6de3a6fd: merge from open-source master 2010-05-04 09:31:11 -07:00
The Android Open Source Project
4929e5a58c am e4b9834f: am 6de3a6fd: merge from open-source master 2010-05-04 09:29:27 -07:00
The Android Open Source Project
e4b9834fea am 6de3a6fd: merge from open-source master
Merge commit '6de3a6fdd303b15ad944570daf37faa798dc1989' into kraken

* commit '6de3a6fdd303b15ad944570daf37faa798dc1989':
  Fix typo of <p> end tag in appwidgets.xml
2010-05-04 09:27:35 -07:00
The Android Open Source Project
6de3a6fdd3 merge from open-source master
Change-Id: I5f552b45caae639170674213c23f154437b58afd
2010-05-04 09:20:16 -07:00
Dan Morrill
89d97c1418 Adding the backward-compatible filtering heuristics for the new device
features definitions added in FroYo.

Change-Id: I5024e45c62813fe2fd2ff4d222df816a86a94f86
2010-05-04 08:39:03 -07:00
Leon Clarke
b4f6b2114c Don't load prefetch requests when roaming 2010-05-04 10:59:51 +01:00
Jack Palevich
59aa2ecd00 Merge "Declare that testViewport targets Froyo APIs" 2010-05-03 21:28:30 -07: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
facad955a8 am dcb5f18f: am 007ad770: merge from open-source master 2010-05-03 16:26:53 -07:00
Romain Guy
5bc30057e0 Merge "Fix typo of <p> end tag in appwidgets.xml" 2010-05-03 16:25:34 -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
e4dd7cbe5d Merge "sometimes database lock is not held before compiling a statement" 2010-05-03 13:05:06 -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
Guang Zhu
6c15f6003a improvements on layout test
* reduce timeout limit from 30s to 15s
* terminate a test case under some condition on uncaught JS exception
* minor fixes

Change-Id: Iabc8f214544d2c8c14139756abc049870023fea5
2010-05-03 11:49:04 -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
Daniel Lehmann
edd904fd31 Merge "Allow contact-sources to rename the term "All Contacts"" 2010-05-03 09:56:48 -07:00
Jean-Baptiste Queru
0c388fd29c Adapt to new location of libcore
Change-Id: Ie4fb163fb9f04a96f8412a996d43321accb28cc8
2010-05-03 09:50:38 -07:00