Commit Graph

11223 Commits

Author SHA1 Message Date
Robert Greenwalt
14f2ef4c9d Move the net transition wakelock to ConnService.
When the default network goes down we lose the wake-on-incoming-data capability
until the new net is brought up and apps rebuild their connections.  We fixed this
in Wifi, but it's a general connectivity issue, not a wifi issue so moving the
mechanism to connecitivty so other networks can use it.

bug:2734419
Change-Id: I39b5d825eb6b548bd9bb8f179b89254f4db53147
2010-06-16 11:04:37 -07:00
Adam Powell
1091e00822 Merge "Fix bug 2771204" 2010-06-16 10:52:50 -07:00
Adam Powell
99969da377 Fix bug 2771204
Change-Id: If34cf07b0901c985f8260bcd20c1375ae76a0fa0
2010-06-16 10:51:30 -07:00
Patrick Scott
6e90ddb2d8 Move WebViewDatabase initialization into a background thread.
This isn't the perfect solution as any calls into WebViewDatabase will block
until initialization completes.  It is better than the current model which
blocks when creating the WebViewDatabase.

In order to get a perfect solution, we would need to do initialization in the
background and have a way to interact with the database during initialization
that would not block.

Bug: 2721802
Change-Id: Ibbaf7f97926128de6534fbf2148452099766c6b7
2010-06-16 13:50:45 -04:00
Patrick Scott
97147286d1 Fix a monkey crash when the new WebView is destroyed.
Grab the WebViewCore immediately so that if the Tab is destroyed, we have the
old WebViewCore object and can return the BrowserFrame.

Bug: 2733004
Change-Id: Ic3e4c5417f2165f412f60f05aea3ed403d8cecfd
2010-06-16 13:34:07 -04:00
Kristian Monsen
edb20ac70e Adding a way for native code to get the apps data directory
Change-Id: I9da5376a202cb2d24c2125352efeb9bffcfe357b
2010-06-16 17:24:21 +01:00
Danica Chang
672e04b5d2 deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp
Change-Id: I2bc63979bada9e18bcfeb9e740fab8b37c6868b9
2010-06-15 15:54:21 -07:00
Jean-Baptiste Queru
6b9a1a5124 Merge "Fixing counting the number of days in call log screen." 2010-06-15 15:11:34 -07:00
Romain Guy
9295ada0ec Allow the use of styles with LinearLayout, make "useLargestChild" attr public.
Change-Id: I044f3f5bd9b90c684ded7a37ff85e3aa8d15af96
2010-06-15 14:00:52 -07:00
Martin Nordholts
e429c5ec9d Support custom themes with AlertDialog.Builder
Add a constructor to AlertDialog.Builder with a 'theme' parameter so
that e.g. the buttons in a dialog built with AlertDialog.Builder can
be themed.

Change-Id: Ie1b1c9706ad2146c8b64dd91fe249c6855c6ac65
2010-06-15 12:05:17 -07:00
Romain Guy
e82ff9ed14 Merge "fillWindow's start position must be smaller than getCount value" 2010-06-15 11:47:02 -07:00
Vasu Nori
daa4e4faff throw correct exception
when an argument is incorrect, throw IllegalArgumentException
not IllegalStateException

Change-Id: I9a33410617ab6a00147c3ab2010ed31251983329
2010-06-15 11:32:27 -07:00
Scott Main
84b51c8eb7 am fb48f3a2: am e4bca7ee: am 322e7e47: Merge "docs: fix markup error" into froyo
Merge commit 'fb48f3a25d821a9037591aa76faa7bae46d1debd'

* commit 'fb48f3a25d821a9037591aa76faa7bae46d1debd':
  docs: fix markup error
2010-06-15 10:50:30 -07:00
Scott Main
fb48f3a25d am e4bca7ee: am 322e7e47: Merge "docs: fix markup error" into froyo
Merge commit 'e4bca7ee60c6d361ef9f1f025881a6f80a9efdab' into gingerbread-plus-aosp

* commit 'e4bca7ee60c6d361ef9f1f025881a6f80a9efdab':
  docs: fix markup error
2010-06-15 10:47:21 -07:00
Scott Main
b860fd11e9 am 322e7e47: Merge "docs: fix markup error" into froyo
Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into froyo-plus-aosp

* commit '322e7e477d89aca18d65cbd289343e716c45a699':
  docs: fix markup error
2010-06-15 10:45:50 -07:00
Scott Main
e4bca7ee60 am 322e7e47: Merge "docs: fix markup error" into froyo
Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into gingerbread

* commit '322e7e477d89aca18d65cbd289343e716c45a699':
  docs: fix markup error
2010-06-15 10:42:52 -07:00
The Android Open Source Project
a191eb013a Fix build
This file was brought back to life by mistaken when merging from
a branch where it was modified into a branch where it had been
deleted

Change-Id: I406c6ced978abfdd59684f14bc9dd53ee7968aae
2010-06-15 09:59:15 -07:00
The Android Open Source Project
4138677a72 merge from open-source master
Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c
2010-06-15 09:30:31 -07:00
Mathias Agopian
15f87c6e4b am 5126633a: am 2d468c5d: Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
Merge commit '5126633a3e7d04754792e0702231b1b6be2d1498'

* commit '5126633a3e7d04754792e0702231b1b6be2d1498':
  Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
2010-06-14 22:03:33 -07:00
Mathias Agopian
5126633a3e am 2d468c5d: Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
Merge commit '2d468c5d73cc1cefbcfa8d98e30622c54756918c' into gingerbread-plus-aosp

* commit '2d468c5d73cc1cefbcfa8d98e30622c54756918c':
  Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
2010-06-14 22:00:40 -07:00
Mathias Agopian
2d468c5d73 Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
this is needed for backward compatibility with somewhat buggy applications.
not a big deal, since the app can request another format explicitely.

Change-Id: Ic73f8acedf94ffc0115637efac28fa8ffaa7e5a4
2010-06-14 21:56:34 -07:00
Vasu Nori
d127fb69ae Merge "fix bugs introduced by I3ef1bcdb2eb1c45f68e829ccb6e3ecde28076591" 2010-06-14 17:11:20 -07:00
Vasu Nori
ad239ab8fa when closing db, close all pending statements also
Change-Id: Ia543933e0cd70852c4e60623de698bb51b976900
2010-06-14 16:58:47 -07:00
Vasu Nori
0a2c6cc013 fix bugs introduced by I3ef1bcdb2eb1c45f68e829ccb6e3ecde28076591
two bugs were introduced by the above CL
1. to test if the column value is NULL, getType_native() should check if
the columnindiex is valid. (it seems sometimes callers could ask if a
given non-existent column is null - and the answer should be true.)
2. if a column is null and isBlob_native, isString_native methods should
return true - not false.

Change-Id: I64df75d0a3840a4502c00db8759c66ba4b268a26
2010-06-14 15:57:30 -07:00
Christian Mehlmauer
e6af73e18e Replaced deprecated Inten.toURI method
Change-Id: Iff3200294edbc1cac188502219bfe481133a5d8e
2010-06-14 15:47:15 -07:00
Brad Fitzpatrick
4ed8e42c50 am 92dd85d0: am 742b282e: Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
Merge commit '92dd85d02af60b001f1ae6919eeb11bcf38e64c8'

* commit '92dd85d02af60b001f1ae6919eeb11bcf38e64c8':
  StrictMode: implement the log-to-DropBox option
2010-06-14 15:25:09 -07:00
Brad Fitzpatrick
92dd85d02a am 742b282e: Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
Merge commit '742b282e1168ed3820cb549a89753f39f4de0fa6' into gingerbread-plus-aosp

* commit '742b282e1168ed3820cb549a89753f39f4de0fa6':
  StrictMode: implement the log-to-DropBox option
2010-06-14 15:21:21 -07:00
Brad Fitzpatrick
742b282e11 Merge "StrictMode: implement the log-to-DropBox option" into gingerbread 2010-06-14 15:19:51 -07:00
Fabrice Di Meglio
0028249ad3 Merge "Fix bug #1661857 (switch from using meta feed to the new allcalendars feed)" 2010-06-14 15:10:19 -07:00
Fabrice Di Meglio
c3cc13306c Fix bug #1661857 (switch from using meta feed to the new allcalendars feed)
- add more properties to Calendars: selfUrl, editUrl, eventsUrl and deleted
- add CalendarsEntity and associated iterator
- cleaup interfaces definition for Calendars / Events columns by factorising  Sync and Account columns

Change-Id: I730e9d377316d458f7d225ce85966c7048ad26a9
2010-06-14 15:08:12 -07:00
Vasu Nori
6c354da943 read old version of data and use multiple connections to db
cts tests are in Change-Id: Ifcc89b4ff484c7c810fd2d450ded212a43360dda
dependency on: Change-Id: I938c42afc3fb50f5296d01c55ffcf4a102d8b0cb

1. Use sqlite's work-in-progress writeahead logging feature to read old
     versions of data and thus increase concurrency of readers
     even when there is a writer on the database
2. New API executeQueriesInParallel() sets up a database connecion pool
     automatically created and managed by sqlite java layer
3. To increase reader concurrency, add an option to do BEGIN IMMEDIATE xaction
     instead of BEGIN EXCLUSIVE

Change-Id: I3ce55a8a7cba538f01f731736e7de8ae1e2a8a1f
2010-06-14 14:50:03 -07:00
Dianne Hackborn
c465f9c400 am 13792057: am 7e900cbf: Merge "Update build version information." into gingerbread
Merge commit '13792057e4fef30c9b6fe2b8249b246841508164'

* commit '13792057e4fef30c9b6fe2b8249b246841508164':
  Update build version information.
2010-06-14 14:44:17 -07:00
Dianne Hackborn
13792057e4 am 7e900cbf: Merge "Update build version information." into gingerbread
Merge commit '7e900cbf1d600a8895e63a0247f45c116ff05172' into gingerbread-plus-aosp

* commit '7e900cbf1d600a8895e63a0247f45c116ff05172':
  Update build version information.
2010-06-14 14:13:07 -07:00
Dianne Hackborn
7e900cbf1d Merge "Update build version information." into gingerbread 2010-06-14 14:10:43 -07:00
Dianne Hackborn
3e03cfa3af Update build version information.
Change-Id: If53f16d494255230859a30f561e9a78ec49c6c10
2010-06-14 14:08:20 -07:00
Brad Fitzpatrick
143666f0ca StrictMode: implement the log-to-DropBox option
Change-Id: I51d12e264155078f953028241f8c5cbdc47262e8
2010-06-14 13:38:01 -07:00
Sen Hu
bde7570659 wire up sampling profiler to dropbox
When system property "persist.sys.profiler_hz" > 0, SamplingProfilerService is
loaded to SystemServer. It creates a FileObserver, watching any new file in the snapshot
directory. When a snapshot is found, it is put in dropbox and deleted after that.

SamplingProfilerIntegration writes snapshots with headers. Headers are <name, value> pairs,
instantiated by caller.

Currently header format is (also in source comment):

Version: <version number of profiler>\n
Process: <process name>\n
Package: <package name, if exists>\n
Package-Version: <version number of the package, if exists>\n
Build: <fingerprint>\n
\n
<the actual snapshot content begins here...>

BUG=2732642

Change-Id: I2c1699f1728e603de13dbd38f9d8443cd3eecc06
2010-06-14 13:27:01 -07:00
The Android Open Source Project
e377032899 am 864c68ea: merge from froyo-plus-aosp
Merge commit '864c68ea452baa0f4f298faf2155af45a9b6d60c'

* commit '864c68ea452baa0f4f298faf2155af45a9b6d60c':
  Added an addAll to the ArrayAdapter
  WLAN: Reset power save mode to startup value after DHCP response.
  Add PageUp and PageDown hot keys
  Should accept "application/vnd.wap.multipart.alternative" message.
  replaced deprecated getIntent with parseURI
2010-06-14 11:39:26 -07:00
The Android Open Source Project
864c68ea45 merge from froyo-plus-aosp
Change-Id: I9cede57e10df9d6ba411b2960a77d7b9b60a1489
2010-06-14 11:35:51 -07:00
The Android Open Source Project
d7b814188d merge from open-source master
Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
2010-06-14 11:07:32 -07:00
The Android Open Source Project
51a9839ec6 merge from open-source master
Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2
2010-06-14 11:06:33 -07:00
The Android Open Source Project
ea1647aff1 merge from open-source master
Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47
2010-06-14 10:57:53 -07:00
Jean-Baptiste Queru
4bd0073299 Merge "replaced deprecated getIntent with parseURI" 2010-06-14 10:28:23 -07:00
Brad Fitzpatrick
26b327c80b am 6b9b8806: am 60e8c33d: Merge "Dropbox: remove redundant Entry construction." into gingerbread
Merge commit '6b9b8806afb06e393203450bda8a53af08952590'

* commit '6b9b8806afb06e393203450bda8a53af08952590':
  Dropbox: remove redundant Entry construction.
2010-06-14 09:36:12 -07:00
Brad Fitzpatrick
6b9b8806af am 60e8c33d: Merge "Dropbox: remove redundant Entry construction." into gingerbread
Merge commit '60e8c33d6f6caad2e963e91abca16a85cd3be82a' into gingerbread-plus-aosp

* commit '60e8c33d6f6caad2e963e91abca16a85cd3be82a':
  Dropbox: remove redundant Entry construction.
2010-06-14 09:34:22 -07:00
Steve Block
dbf72e21a4 Merge "Add the basic outline of the web runtime used to display installed web applications" 2010-06-14 09:32:38 -07:00
Jean-Baptiste Queru
5978bcc32b Merge "Added an addAll to the ArrayAdapter" 2010-06-14 09:27:14 -07:00
Brad Fitzpatrick
14418945bd Dropbox: remove redundant Entry construction.
Change-Id: I55d8da82acea7f1cf0a69912fe5d4d46d704b570
2010-06-14 08:58:26 -07:00
Steve Block
4deb139b8e Add the basic outline of the web runtime used to display installed web applications
This is still a work in progress.

Bug: 2766920

Change-Id: I2d3dd4b3b88bf84d8d66386e43a21c4085627c4d
2010-06-14 16:58:10 +01:00
Jean-Baptiste Queru
a2e2d20256 Merge "Should accept "application/vnd.wap.multipart.alternative" message." 2010-06-14 08:56:49 -07:00