Commit Graph

8846 Commits

Author SHA1 Message Date
Jaikumar Ganesh
b43f427feb am 1aea42ae: am ca4d4de8: Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken 2010-05-05 11:07:35 -07:00
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
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
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
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
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
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
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
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
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
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
Dianne Hackborn
47c0c942b0 Fix issue #2555171: Switching to app immediately after unmounting...
...SD card causes reboot.

Add option to not include temporarily unavailable recent tasks,
for the recent tasks UI to not display them.

Change-Id: I1495ca217b4292fd56f537459b44c0624262c292
2010-04-30 14:24:18 -07:00
Scott Main
d17da43c82 docs: revise and add documentation for backup APIs
Change-Id: I0b015a6de16da07ccd31756b8d2329dc2785c2f7
2010-04-29 21:42:58 -07:00
Dianne Hackborn
09d91ca47c am fefe7a22: Merge "Fix build." into kraken 2010-04-29 18:01:33 -07:00
Dianne Hackborn
22ec9ab3b8 Fix build.
Change-Id: Iac00a1d02d04c346807ff2580362adfc838d1813
2010-04-29 17:56:03 -07:00
Marc Blank
5b4628f71a am 8abcce1f: am 9ca81664: am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo 2010-04-29 17:09:25 -07:00
Marc Blank
8abcce1f7b am 9ca81664: am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
Merge commit '9ca816649bd2af7d540f375be8fcc503c50aef72' into kraken

* commit '9ca816649bd2af7d540f375be8fcc503c50aef72':
  Expose _id in ExtendedProperties subValues
2010-04-29 16:28:50 -07:00
Marc Blank
9ca816649b am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
Merge commit '794cd640bfa8c6d82803b59bc18cbd73627a8162' into froyo-plus-aosp

* commit '794cd640bfa8c6d82803b59bc18cbd73627a8162':
  Expose _id in ExtendedProperties subValues
2010-04-29 15:40:30 -07:00
takuo
42b21c3333 Parse custom text header and ignore it.
Some MMS carrier append own custom header as text into PduData. We should parse it and ignore it at the moment.

Change-Id: I4d6cf20f5cf99172ebbe310ab18101316eb04c77
2010-04-30 07:11:53 +09:00
Marc Blank
8f643c1040 Expose _id in ExtendedProperties subValues
* ExtendedValues' "name" and "value" columns are exposed in Entry
  entity subvalues, but it is clumsy to change a value, as the _id
  of the ExtendedValues row isn't also exposed.  (We otherwise have to
  perform a potentially slow query)
* This CL adds the _id column to the columns exposed

Bug: 2638762
Change-Id: Iaffeffed620af78439f5f73aa5f3257b0f8a0fd0
2010-04-29 14:50:37 -07:00
takuo
334dc0b270 Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
And take the first part of parsed as a parent part data.

Change-Id: I2752654f41d642524061802772e2a7eaa10a4e2d
2010-04-30 05:12:19 +09:00
Makoto Onuki
2589716964 Make RequeryOnUiThreadException warning less spamy
- Moved the thread check from AbstractCursor to SQLiteCursor.
- Show warning only once per database

Bug 2633883

Change-Id: I915bfba8715a469c45fb68ba1282231279f2a50c
2010-04-29 11:36:48 -07:00
Adam Powell
8c2d5cf826 am 6bbb65e6: am 6483f6d5: am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early 2010-04-28 19:45:04 -07:00
Adam Powell
6bbb65e6fc am 6483f6d5: am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early
Merge commit '6483f6d546655a9579670b42d445614cab609e28' into kraken

* commit '6483f6d546655a9579670b42d445614cab609e28':
  Fix bug 2639949 - Don't stop a Scroller early
2010-04-28 19:38:41 -07:00
Adam Powell
6483f6d546 am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early
Merge commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d' into froyo-plus-aosp

* commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d':
  Fix bug 2639949 - Don't stop a Scroller early
2010-04-28 19:34:49 -07:00
Dianne Hackborn
8640c1d0e5 am 14cee9f6: New xlarge screen size. 2010-04-28 16:58:05 -07:00
Dianne Hackborn
14cee9f688 New xlarge screen size.
Not complete, only for experimentation at this point.

This includes a reworking of how screen size configurations are matched,
so that if you are on a larger screen we can select configurations for
smaller screens if there aren't any exactly matching the current screen.

The screen size at which we switch to xlarge has been arbitrarily
chosen; the compatibility behavior has not yet been defined.

Change-Id: I1a33b3818eeb51a68fb72397568c39ab040a07f5
2010-04-28 16:51:52 -07:00
Steve Kondik
59eb69192c Fix an NPE in InputMethodService when mExtractAction is null.
This happens with certain third-party IMEs.

Fixes: http://code.google.com/p/cyanogenmod/issues/detail?id=231

Change-Id: Idf4349ee9c7c8f73c255745bc65b49ba9b593874
2010-04-28 16:37:01 -07:00
Adam Powell
b40c42f1ff Fix bug 2639949 - Don't stop a Scroller early
Change-Id: Ia827199a27d03289b6fa573dd6f2b13517943400
2010-04-28 16:36:37 -07:00
Steve Howard
0c0b1b3a07 am 3fd6419f: am 3b20c9e8: am 81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo 2010-04-28 16:14:51 -07:00
Steve Howard
3fd6419fe5 am 3b20c9e8: am 81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
Merge commit '3b20c9e80533401d8c423977ef86460d789d4e1e' into kraken

* commit '3b20c9e80533401d8c423977ef86460d789d4e1e':
  Fix a minor bug in transitions to left-edge-up landscape.
2010-04-28 16:07:18 -07:00
Steve Howard
3b20c9e805 am 81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
Merge commit '81ac367be66905a5b53b8e7e98160546802bd98b' into froyo-plus-aosp

* commit '81ac367be66905a5b53b8e7e98160546802bd98b':
  Fix a minor bug in transitions to left-edge-up landscape.
2010-04-28 16:03:28 -07:00
Steve Howard
81ac367be6 Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo 2010-04-28 15:59:39 -07:00