Commit Graph

7599 Commits

Author SHA1 Message Date
The Android Open Source Project
9f4247668e am 31bfdf69: reconcile main tree with open-source eclair
Merge commit '31bfdf695ef741f64066ef605bd6a7e23df88714' into eclair-plus-aosp

* commit '31bfdf695ef741f64066ef605bd6a7e23df88714':
  android-2.1_r1 snapshot
  Use 128p map tiles for high dpi devices.
  Throttle nitz updates as the are too numerous on cdma.
  don't request a sync when temp providers are created
  Increase light sensor delay from one to two seconds.
  Revert jparks code from IPCThreadState.
  Add a warning when we leave threads in the binder thread pool in the background scheduling group.
  PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
  Fix regression.
  Fix broken build.
  Bluetooth A2DP suspend/resume functionality
  EventLog when a database file is deleted due to corruption.
  Don't forget to clear "backup in progress" state when finishing a pass
  Fix issue #2148939: Sholes slow to wake up in landscape mode
  Fix Cdma re-start of default connection.
  Merge change 26821 into eclair
  Not all WebView's host have permission to read the history.
  Merge change 26908 into eclair
2010-02-05 08:48:38 -08:00
The Android Open Source Project
93fe6a1cee reconcile main tree with open-source eclair 2010-02-05 08:09:38 -08:00
Eric Laurent
df7b593133 am aead64de: Fix issue: 2413494: [Passion-c] Add TTY support.
Merge commit 'aead64def1fe58c95c086a0ca00cf0b13fa32ef1' into eclair-plus-aosp

* commit 'aead64def1fe58c95c086a0ca00cf0b13fa32ef1':
  Fix issue: 2413494: [Passion-c] Add TTY support.
2010-02-04 09:34:34 -08:00
Katie McCormick
4376a0cafc am 8a6c0607: Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclair
Merge commit '8a6c060719c8870f370b82faa48ae2f437915214' into eclair-plus-aosp

* commit '8a6c060719c8870f370b82faa48ae2f437915214':
  SDK doc change: Fixed typo--fingure->finger
2010-02-03 20:21:26 -08:00
Katie McCormick
6225fcd804 Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclair 2010-02-03 16:52:18 -08:00
Scott Main
3ef51c88b6 am 98a9fc0a: Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair
Merge commit '98a9fc0a0025a3df7b36f7752fc330eba8810603' into eclair-plus-aosp

* commit '98a9fc0a0025a3df7b36f7752fc330eba8810603':
  docs: revise the Style and Themes document to improve the
2010-02-03 16:18:17 -08:00
Scott Main
957a1a2571 Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair 2010-02-03 16:11:41 -08:00
Megha Joshi
439270f03e am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair
Merge commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434' into eclair-plus-aosp

* commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434':
  Screenshots for sample syncadapter.
2010-02-03 12:29:19 -08:00
Megha Joshi
277345ae33 Merge "Screenshots for sample syncadapter." into eclair 2010-02-03 12:24:20 -08:00
Mike Lockwood
5378838b0b am a0460004: Merge "Ignore NTP time fixes that differ from system time by more than 5 minutes." into eclair
Merge commit 'a0460004aae7576114639393a230f18608d213e6' into eclair-plus-aosp

* commit 'a0460004aae7576114639393a230f18608d213e6':
  Ignore NTP time fixes that differ from system time by more than 5 minutes.
2010-01-29 20:12:21 -08:00
John Wang
a74f6908c6 am 8deed914: Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair
Merge commit '8deed914c2df15d71674deae591bcd3313093931' into eclair-plus-aosp

* commit '8deed914c2df15d71674deae591bcd3313093931':
  Handle RIL_UNSOL_RESEND_INCALL_MUTE.
2010-01-29 20:12:15 -08:00
Mike Lockwood
97c0df6c31 Merge "Ignore NTP time fixes that differ from system time by more than 5 minutes." into eclair 2010-01-29 20:09:16 -08:00
John Wang
2d15d737b7 Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair 2010-01-29 20:07:14 -08:00
Jim Miller
8fee03b1f0 am d8a3a895: Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Merge commit 'd8a3a8957b9d71ab75584b0cc98324fd70cc527c' into eclair-plus-aosp

* commit 'd8a3a8957b9d71ab75584b0cc98324fd70cc527c':
  Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
2010-01-29 18:06:48 -08:00
The Android Open Source Project
9a2ed22a74 reconcile android-2.1_r1 snapshot 2010-01-29 14:09:16 -08:00
Scott Main
89f164ff7c am 9800adf2: Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair
Merge commit '9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8' into eclair-plus-aosp

* commit '9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8':
  docs: update web page debugging with info about page and line
2010-01-29 13:47:40 -08:00
Dirk Dougherty
329df1b5b0 am 196ec566: Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
Merge commit '196ec566b39340942f146ce4a9af775f4c648d2d' into eclair-plus-aosp

* commit '196ec566b39340942f146ce4a9af775f4c648d2d':
  SDK doc change: Increment the platform version var used in doc footer and elsewhere.
2010-01-29 13:47:28 -08:00
Scott Main
f2d703adf0 Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair 2010-01-29 13:40:53 -08:00
Dirk Dougherty
aa51f1a242 Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair 2010-01-28 17:59:24 -08:00
Dirk Dougherty
f1e2b83c0a am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
Merge commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e' into eclair-plus-aosp

* commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e':
  SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
2010-01-28 16:46:54 -08:00
Dirk Dougherty
d08c5fb5c8 Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair 2010-01-28 16:40:56 -08:00
Grace Kloba
642a0cb054 am 769ed21c: Fix http://b/issue?id=2400423.
Merge commit '769ed21c33c3629411eb3bbf924de45737a18067' into eclair-plus-aosp

* commit '769ed21c33c3629411eb3bbf924de45737a18067':
  Fix http://b/issue?id=2400423.
2010-01-27 12:30:19 -08:00
Dirk Dougherty
a1cfe958c6 am 965f4a6b: Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair
Merge commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef' into eclair-plus-aosp

* commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef':
  doc change only: Update announcement and mwc redirect to point to microsite.
2010-01-26 18:05:23 -08:00
Dirk Dougherty
ddacb39772 Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair 2010-01-26 18:00:29 -08:00
Jim Miller
b4716b81a2 am 9985867a: Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Merge commit '9985867a8eb80c6db84c80a9b5e96bd68e2d14d7' into eclair-plus-aosp

* commit '9985867a8eb80c6db84c80a9b5e96bd68e2d14d7':
  Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
2010-01-26 13:55:16 -08:00
Robert Greenwalt
8c940c94fd am cc4b4016: Fix the reporting of NO_CONNECTIVITY.
Merge commit 'cc4b4016e4b86db012f94bb889e5ca61ff362171' into eclair-plus-aosp

* commit 'cc4b4016e4b86db012f94bb889e5ca61ff362171':
  Fix the reporting of NO_CONNECTIVITY.
2010-01-25 18:56:32 -08:00
Robert Greenwalt
83eda0c788 am 5381e4ef: Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair
Merge commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750' into eclair-plus-aosp

* commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750':
  Refine fix I53e91db7 to apply only to wifi network
2010-01-25 16:54:28 -08:00
Scott Main
781012c991 am d243bc71: Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair
Merge commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e' into eclair-plus-aosp

* commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e':
  docs: reference the history JS file with docRoot in order to
2010-01-25 16:54:20 -08:00
Robert Greenwalt
06fb48ea18 Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair 2010-01-25 16:50:10 -08:00
Scott Main
e3ec5eb95b Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair 2010-01-25 15:39:46 -08:00
Mike Reed
6c2d9c241b am f904be16: Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair
Merge commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737' into eclair-plus-aosp

* commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737':
  disable high-quality filtering during scrolling, until I can cached the scaled images.
2010-01-25 06:24:35 -08:00
Mike Reed
e14a1ad9cc Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair 2010-01-25 06:19:17 -08:00
Jim Miller
65c1cbfaa1 am 2e4e25f3: Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair
Merge commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc' into eclair-plus-aosp

* commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc':
  Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
2010-01-22 20:23:37 -08:00
Jim Miller
4691ef5e0f Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair 2010-01-22 20:19:12 -08:00
Dirk Dougherty
c11cc12776 am 84207956: Merge "SDK doc change: Misc small fixes." into eclair
Merge commit '8420795633443221627eb872aea8f2862a38f8b1' into eclair-plus-aosp

* commit '8420795633443221627eb872aea8f2862a38f8b1':
  SDK doc change: Misc small fixes.
2010-01-22 16:50:03 -08:00
Dirk Dougherty
db01bf12dc am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair
Merge commit 'c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a' into eclair-plus-aosp

* commit 'c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a':
  SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
2010-01-22 16:49:57 -08:00
Dirk Dougherty
79643e1692 Merge "SDK doc change: Misc small fixes." into eclair 2010-01-22 16:45:58 -08:00
Dirk Dougherty
770a2991ab Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair 2010-01-22 16:38:59 -08:00
Dianne Hackborn
25e77b334f am 678e66a4: Merge "Fix issue #2391429: Crash during boot if fwd locked app is incompletely installed" into eclair
Merge commit '678e66a4ec8bdceafd12f7d82c7d4aa8acf71aa2' into eclair-plus-aosp

* commit '678e66a4ec8bdceafd12f7d82c7d4aa8acf71aa2':
  Fix issue #2391429: Crash during boot if fwd locked app is incompletely installed
2010-01-22 15:51:02 -08:00
Dianne Hackborn
29513890e3 Merge "Fix issue #2391429: Crash during boot if fwd locked app is incompletely installed" into eclair 2010-01-22 15:47:08 -08:00
Dirk Dougherty
9c64b7d8da am 5d14cb34: Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair
Merge commit '5d14cb34c0e9760340c15ac5faf2d76a64797117' into eclair-plus-aosp

* commit '5d14cb34c0e9760340c15ac5faf2d76a64797117':
  doc change: add announce for developer lab at mwc. move adc to carousel.
2010-01-22 14:28:05 -08:00
Dirk Dougherty
a2fa14097b Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair 2010-01-22 14:23:39 -08:00
John Wang
e390ac7b9f am 098295a5: Merge "Updated emergency string when locale changes." into eclair
Merge commit '098295a5a3e840e94040ce38eb08eb6c72b2a7e0' into eclair-plus-aosp

* commit '098295a5a3e840e94040ce38eb08eb6c72b2a7e0':
  Updated emergency string when locale changes.
2010-01-22 13:20:25 -08:00
Grace Kloba
9b65699d11 am 5ff24d5d: DO NOT MERGE
Merge commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d' into eclair-plus-aosp

* commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d':
  DO NOT MERGE
2010-01-22 13:17:52 -08:00
John Wang
0ac75bfa33 Merge "Updated emergency string when locale changes." into eclair 2010-01-22 13:17:25 -08:00
Eric Laurent
422068ab92 am a59551ba: Merge "Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair
Merge commit 'a59551bade6a7b0c916c277f044de79c6af1bd22' into eclair-plus-aosp

* commit 'a59551bade6a7b0c916c277f044de79c6af1bd22':
  Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.
2010-01-22 10:25:00 -08:00
John Wang
9a6a4486c3 am 08cb0024: Handle emergency calls only status in ServiceStateTracker.
Merge commit '08cb0024026e0f42612ab569e1e4067d5ede3bf8' into eclair-plus-aosp

* commit '08cb0024026e0f42612ab569e1e4067d5ede3bf8':
  Handle emergency calls only status in ServiceStateTracker.
2010-01-22 10:24:47 -08:00
Eric Laurent
17739fe712 Merge "Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair 2010-01-22 10:14:26 -08:00
Fred Quintana
8db9427d58 am 9a400fa4: Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair
Merge commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1' into eclair-plus-aosp

* commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1':
  initialize sync adapters that get installed while the system is running
2010-01-21 17:35:28 -08:00
jsh
ef32ea29b3 am 036e2108: Fix NPE when importing from USIM.
Merge commit '036e21083d9936425687d7de29e95b2c458a7e4a' into eclair-plus-aosp

* commit '036e21083d9936425687d7de29e95b2c458a7e4a':
  Fix NPE when importing from USIM.
2010-01-21 17:35:18 -08:00