Commit Graph

277 Commits

Author SHA1 Message Date
Steve Howard
825bdff3b8 resolved conflicts for merge of 538c3fa3 to master
Change-Id: I9190ca078ffd8b51515e3d53ac5753c05110c014
2010-09-30 14:41:59 -07:00
Steve Howard
538c3fa35f am cdcc0a65: Merge "Have download manager give more details when downloads are paused" into gingerbread
Merge commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada' into gingerbread-plus-aosp

* commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada':
  Have download manager give more details when downloads are paused
2010-09-30 11:42:16 -07:00
Steve Howard
3e8c1d3a46 Have download manager give more details when downloads are paused
This change introduces more detailed reporting of why downloads are paused in
the download manager.

First, it adds new, more detailed status constants in android.provider.Downloads
for when a download is paused, in place of the old catch-all
STATUS_RUNNING_PAUSED.  I've eliminated some dead code there as well to ease the
change.

Second, in the public API, it changes COLUMN_ERROR_CODE to COLUMN_REASON, which
now reports useful info for STATUS_PAUSED in addition to STATUS_FAILED.  It adds
some new PAUSED_* constants for reason values when a download is paused, and
adds code to generate these values appropriately.

Change-Id: Ie617d1c2c59357375e19466086923ace5e2fb122
2010-09-29 17:34:40 -07:00
Steve Howard
d58429f9ac Manual merge: Move DownloadManager to android.app
Changing package at hackbod's request.

Change-Id: I867017b6a9f4684d30c6c5bd1b07f9cabecddb9f
2010-09-28 17:28:43 -07:00
Steve Howard
9d9719c44a am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread
Merge commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399' into gingerbread-plus-aosp

* commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399':
  Move DownloadManager to android.app (DO NOT MERGE)
2010-09-28 12:41:42 -07:00
Steve Howard
31fd85f39b Move DownloadManager to android.app (DO NOT MERGE)
Changing package at hackbod's request.  I'll merge this manually, as
there's some additional master-only code that will be to be
simultaneously changed.

Change-Id: Ibb629ec1c31807fbee31e0193c6a941d04be0117
2010-09-27 17:12:47 -07:00
Vasu Nori
ffe06127f6 remove public API setConnectionPoolSize()
because connection pool size is now settable by modifying config.xml
of the device.

Change-Id: I973cc11d7dc10c8d95ab83e2f691068f6019fa33
2010-09-27 13:30:49 -07:00
Fabrice Di Meglio
e6147f0c4b am 514a455f: am 28fa220c: Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread
Merge commit '514a455f2a63d6b3366b848a585d99e8680f69aa'

* commit '514a455f2a63d6b3366b848a585d99e8680f69aa':
  Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)
2010-09-27 02:36:40 -07:00
Fabrice Di Meglio
514a455f2a am 28fa220c: Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread
Merge commit '28fa220c8da1ea2933ac96595516d1efa545c1ea' into gingerbread-plus-aosp

* commit '28fa220c8da1ea2933ac96595516d1efa545c1ea':
  Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)
2010-09-27 02:27:08 -07:00
Fabrice Di Meglio
28fa220c8d Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread 2010-09-27 02:16:01 -07:00
Fabrice Di Meglio
8f57caf8ed Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)
- force UTC timezone if recurrence is corresponding to an "allday" event

Change-Id: I3603438c0ad8019051ed4a8bd39d4aa7c0401eb1
2010-09-24 09:18:25 -07:00
Kenny Root
43480d7b4d am 2b1ffce1: am 7f459df9: Merge "Better errors in PackageManagerTests" into gingerbread
Merge commit '2b1ffce18301ae051a70a85254133c29b9381593'

* commit '2b1ffce18301ae051a70a85254133c29b9381593':
  Better errors in PackageManagerTests
2010-09-23 14:34:55 -07:00
Kenny Root
2b1ffce183 am 7f459df9: Merge "Better errors in PackageManagerTests" into gingerbread
Merge commit '7f459df9f94bc52e53d42894dea4702394fbad5c' into gingerbread-plus-aosp

* commit '7f459df9f94bc52e53d42894dea4702394fbad5c':
  Better errors in PackageManagerTests
2010-09-23 14:31:06 -07:00
Kenny Root
94e0acbf2f Better errors in PackageManagerTests
PackageManagerTests was catching assertion errors and just spitting out
a generic "Hey, there was an error!" message. This eliminates that and
adds some expected outcomes in the assertions.

Change-Id: I27baa3c57c85b0cae4ea76aaf1e2a9b61b2c32b7
2010-09-23 11:11:46 -07:00
Jesse Wilson
674df1b373 am f78fdacc: am eaa2cabf: Merge "Fix problem where Base64InputStream single-byte reads were unsigned." into gingerbread
Merge commit 'f78fdaccde379d1c101be137416808ea62a2f292'

* commit 'f78fdaccde379d1c101be137416808ea62a2f292':
  Fix problem where Base64InputStream single-byte reads were unsigned.
2010-09-22 13:53:33 -07:00
Jesse Wilson
f78fdaccde am eaa2cabf: Merge "Fix problem where Base64InputStream single-byte reads were unsigned." into gingerbread
Merge commit 'eaa2cabf342e973925fb223104f9971deae27b17' into gingerbread-plus-aosp

* commit 'eaa2cabf342e973925fb223104f9971deae27b17':
  Fix problem where Base64InputStream single-byte reads were unsigned.
2010-09-22 11:51:11 -07:00
Jesse Wilson
eaa2cabf34 Merge "Fix problem where Base64InputStream single-byte reads were unsigned." into gingerbread 2010-09-22 11:38:43 -07:00
Jesse Wilson
64b25cf736 Fix problem where Base64InputStream single-byte reads were unsigned.
Change-Id: Ibdfb77a283300baa61738fe98aa1c9f29eaf976f
http://b/3026478
2010-09-22 10:28:27 -07:00
Neal Nguyen
c64c6a99fb am abb45e67: am b9881e6b: Merge "Adding more DL Manager tests." into gingerbread
Merge commit 'abb45e6720a035e909644941b8ef7f92faeb6f34'

* commit 'abb45e6720a035e909644941b8ef7f92faeb6f34':
  Adding more DL Manager tests.
2010-09-21 11:09:52 -07:00
Neal Nguyen
abb45e6720 am b9881e6b: Merge "Adding more DL Manager tests." into gingerbread
Merge commit 'b9881e6b94607334673566493c904f6741087938' into gingerbread-plus-aosp

* commit 'b9881e6b94607334673566493c904f6741087938':
  Adding more DL Manager tests.
2010-09-21 11:05:32 -07:00
Neal Nguyen
df7a865bbf Adding more DL Manager tests.
Change-Id: I87bf91fdd7dbd058c8d619200d2826ba5e7f76fb
2010-09-20 20:40:56 -07:00
Wink Saville
00cfe112b4 Add LinkSocket API
Restructuring ConnectivityService to handle multiple connections.

Change-Id: Ia993fbb120bebb844fd0d603dc76fbc700b31fd1
2010-09-16 21:27:39 -07:00
Vasu Nori
b729dcc8a9 Revert "caching code retooled to reduce locking + handle SMP"
This reverts commit 992f7d52fa.

Change-Id: Ia5b789d1b2195d6ce43baffe24296c857f9b30f6
2010-09-14 11:55:24 -07:00
Vasu Nori
992f7d52fa caching code retooled to reduce locking + handle SMP
1. Moved all code related to compiled-sql statement cache to SQLiteCache.java
Removed all caching related code from everywhere else.
2. Moved all code related to compiling a sql statement and caching it to
SQLiteCompiledSql.java. There was some code in SQLiteProgram.java
releated to this. moved it out.
3. Added state to SQLiteCompiledSql. This is to help in debugging.
Change-Id: I63ab0c9c4419e964eb9796d284dd389985763d83
2010-09-13 14:38:24 -07:00
Svetoslav Ganov
585f13f8de Accessibility support for WebViews
Change-Id: Ibb139192bae4d60fd53a7872b19c06312bb41558
2010-09-13 10:21:34 -07:00
Brad Fitzpatrick
42a5ed2015 resolved conflicts for merge of 171c83f4 to master
Change-Id: I56a4c1838b17cf40d96763f95df3c84fc86359eb
2010-09-12 13:55:18 -07:00
Brad Fitzpatrick
171c83f47d am 11fe181e: Add faster TextUtil function for searching delimited lists.
Merge commit '11fe181e16501103d7c0f70344661ea2ef5d3df9' into gingerbread-plus-aosp

* commit '11fe181e16501103d7c0f70344661ea2ef5d3df9':
  Add faster TextUtil function for searching delimited lists.
2010-09-12 11:03:48 -07:00
Brad Fitzpatrick
11fe181e16 Add faster TextUtil function for searching delimited lists.
The previous version in Settings allocated memory.

Change-Id: I0f821112dc8f830689489f201ce268195f9e6cbd
2010-09-12 10:58:38 -07:00
Vasu Nori
b18f27dbf4 Return count of rows in a resultset only once (when startPos = 0)
If a query returns 100 rows and say only 10 rows fit in 1MB, then client
receiving the cursor from the ContentProvider needs to paginate.
ContentProvider returns count of total data everytime it returns a page
(= 1MB) of data to the client.
Returning total count causes reading (and skipping unwanted) data
from sqlite.
Instead, it should be sufficient to get total count once
and re-use the count value during the life of the cursor
until a requery is performed on the cursor.
(Count won't change unless data is changed - in which case
the cursor is asked to perform requery anyway. So doing count
once and reusing it should work)
Change-Id: I3520d94524dda07be9bcff56b6fbae5276af1d3b
2010-09-10 13:43:19 -07:00
Neal Nguyen
1e3187c27f am 0c592acf: Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread-plus-aosp
Merge commit '0c592acfc0ea298a0cf6c049cce4c5c10974e911'

* commit '0c592acfc0ea298a0cf6c049cce4c5c10974e911':
  Adding Download Manager Integration, stress, and hosts-based tests.
2010-09-08 20:26:50 -07:00
Neal Nguyen
5f53bca55b Adding Download Manager Integration, stress, and hosts-based tests.
Change-Id: I97008f6cfd95ea9950db0b4e093da02528849b63
2010-09-08 17:02:53 -07:00
Jean-Baptiste Queru
cf67abbc48 am 6ffee9bb: Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp
Merge commit '6ffee9bbba53700d33456261b986ac8a3f333b9e'

* commit '6ffee9bbba53700d33456261b986ac8a3f333b9e':
  Revert "resolve conflicts"
2010-09-08 11:07:30 -07:00
Jean-Baptiste Queru
2cc595af65 Revert "resolve conflicts"
This reverts commit 84f992a249.
2010-09-08 11:01:40 -07:00
Jean-Baptiste Queru
980bd4a12d am 84f992a2: resolve conflicts
Merge commit '84f992a249491b9f755e879bf096baac3f9472f5'

* commit '84f992a249491b9f755e879bf096baac3f9472f5':
  Adding Download Manager Integration, stress, and hosts-based tests.
2010-09-08 10:28:41 -07:00
Jean-Baptiste Queru
84f992a249 resolve conflicts
Change-Id: I87f854430f7083cd2f2e28b4ec4a7112ef6fe4f1
2010-09-08 10:02:35 -07:00
Neal Nguyen
40ef0f49ea Adding Download Manager Integration, stress, and hosts-based tests.
Change-Id: If75021380f4aee9c650f6e34093779e85cc4e5d8
2010-09-07 14:27:16 -07:00
Vasu Nori
422dad0f50 android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff
Change-Id: Icf221a8e8d4c281f7719875816835ad7dfe7f3d1
2010-09-07 12:56:57 -07:00
Steve Block
8bb37f7ffb Adds a test case for WebAddress where the path component does not have a leading slash
When a URL is malformed because the path does not start with a slash,
we assume that the path starts with the first character that is not
valid in the host and insert a leading slash. This is the reason why
the regex for the path component does not force a leading slash.

Bug: 1011602
Change-Id: I8efe46c058d2ee2d1a6a4406ee25dc021315222b
2010-09-07 18:57:41 +01:00
Steve Block
582deec1f3 Fixes a problem with URL parsing when the host ends with a dot
The WebAddress class provides a lenient parser for URLs. Currently, it
identifies the host portion with the regex [<chars>]+(\.[<chars>]+)* where
<chars> is the set of characters valid for the host name. This pattern excludes
the case where the host ends with a dot, which is valid possibility. As a
result, any trailing dot is pushed into the path component. Since we add a
leading slash to the path if one is missing, the result is a path that begins
with '/.'.

This fix changes the host regex to [<chars>]+[<chars>\.]* which allows trailing
dots and fixes the problem.

Bug: 2337042
Change-Id: I310512531787e0f742988f5d815ad944fd39e059
2010-09-07 13:22:23 +01:00
Eric Rowe
572031747f am 4ca550a1: am 947e25e5: am ac3c1f55: Add BT test instrumentation for reboot tests.
Merge commit '4ca550a17b8becdf6b5a32909fb5c70ef7579f4e'

* commit '4ca550a17b8becdf6b5a32909fb5c70ef7579f4e':
  Add BT test instrumentation for reboot tests.
2010-09-02 15:03:12 -07:00
Eric Rowe
4ca550a17b am 947e25e5: am ac3c1f55: Add BT test instrumentation for reboot tests.
Merge commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2' into gingerbread-plus-aosp

* commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2':
  Add BT test instrumentation for reboot tests.
2010-09-02 14:59:00 -07:00
Eric Rowe
947e25e5ff am ac3c1f55: Add BT test instrumentation for reboot tests.
Merge commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364' into gingerbread

* commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364':
  Add BT test instrumentation for reboot tests.
2010-09-02 14:55:47 -07:00
Daisuke Miyakawa
b2b973d13e am 3bd9b8f0: Fix build breakage.
Merge commit '3bd9b8f04cece37ab4405abc382e2810006b9f97' into gingerbread-plus-aosp

* commit '3bd9b8f04cece37ab4405abc382e2810006b9f97':
  Fix build breakage.
2010-09-02 13:46:55 -07:00
Daisuke Miyakawa
3bd9b8f04c Fix build breakage.
Change-Id: If519f1730266f10a7852af209127aa4754a7ef9d
2010-09-02 13:42:22 -07:00
Daisuke Miyakawa
22a17ce60b am b1f5a54a: Merge "VCard refactoring backport." into gingerbread
Merge commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7' into gingerbread-plus-aosp

* commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7':
  VCard refactoring backport.
2010-09-02 12:59:36 -07:00
Daisuke Miyakawa
b1f5a54a2a Merge "VCard refactoring backport." into gingerbread 2010-09-02 12:56:15 -07:00
Eric Rowe
6aa717e4a1 am 97e58ef4: Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread
Merge commit '97e58ef444da53165caab2a7be4fe44c154d5a0e' into gingerbread-plus-aosp

* commit '97e58ef444da53165caab2a7be4fe44c154d5a0e':
  DO NOT MERGE Separate utility methods into utility class.
2010-09-02 11:37:51 -07:00
Eric Rowe
27a912a393 Merge "Separate utility methods into utility class." 2010-09-02 11:35:29 -07:00
Eric Rowe
13438b0205 DO NOT MERGE Separate utility methods into utility class.
Methods in BluetoothTestUtils remain the same as they were in
BluetoothStressTest except for the constructor and close().  The constructor
is derived from setUp() and close() from tearDown().

Change-Id: Ifce16346f30eccdcc10ab846800e8a6fd2a24361
2010-09-02 11:29:59 -07:00
Daisuke Miyakawa
69831d9dc1 VCard refactoring backport.
Change-Id: Icf265ce7f83c1e2bd5db0c3d9bd4c142afd6db34
2010-09-02 10:39:00 -07:00