301 Commits

Author SHA1 Message Date
Brett Chabot
e8ce130de1 am 0194eeab: am 4940ff85: Update to new ddmlib-prebuilt api.
Merge commit '0194eeabfe2cef825f3e91144529be6644ef84c0'

* commit '0194eeabfe2cef825f3e91144529be6644ef84c0':
  Update to new ddmlib-prebuilt api.
2010-09-10 15:02:01 -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
Brett Chabot
0194eeabfe am 4940ff85: Update to new ddmlib-prebuilt api.
Merge commit '4940ff85d561310d2c122ca6bd7de4d00772b095' into gingerbread-plus-aosp

* commit '4940ff85d561310d2c122ca6bd7de4d00772b095':
  Update to new ddmlib-prebuilt api.
2010-09-10 13:03:57 -07:00
Brett Chabot
4940ff85d5 Update to new ddmlib-prebuilt api.
Change-Id: Ib99f5eab2b4ecfde8461f93676f0dbd1f1b38241
2010-09-09 20:38:54 -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 84f992a249491b9f755e879bf096baac3f9472f5.
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
Vasu Nori
8eb1bfe0f6 Merge "fix isIntegrityCheck() & add a sample impl class and test for DatabaseErrorHandler" 2010-09-02 09:42:11 -07:00
Eric Rowe
ac3c1f550f Add BT test instrumentation for reboot tests.
Change-Id: If8134a1c11f3982086b7299e5c8bd3ef8eaa5959
2010-08-31 15:06:58 -07:00
Eric Rowe
185a0b04c6 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: Ib472878fee2aa1b678e8ee6743cac2373eb7507f
2010-08-31 13:47:47 -07:00
Eric Rowe
1314219a37 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: I09f9637d3969c98e46cbde1d61bc6c3223aec7c1
2010-08-31 10:44:00 -07:00
Kenny Root
6c8beb0cb4 am 8a5ab396: am 2e86809b: Merge "Native libraries on SD" into gingerbread
Merge commit '8a5ab396cf4f3bb76a3e820f16f946e313b73fcf'

* commit '8a5ab396cf4f3bb76a3e820f16f946e313b73fcf':
  Native libraries on SD
2010-08-30 15:24:45 -07:00
Kenny Root
8a5ab396cf am 2e86809b: Merge "Native libraries on SD" into gingerbread
Merge commit '2e86809b6c79375d23c0975914efc3b66e89ac90' into gingerbread-plus-aosp

* commit '2e86809b6c79375d23c0975914efc3b66e89ac90':
  Native libraries on SD
2010-08-30 15:21:17 -07:00
Kenny Root
0ac83f5a7c Native libraries on SD
* Add native library tests during package move

* Fix omission that let PackageSettings and ApplicationInfo get out of
  sync.

Change-Id: Ic4958f971cb2c9cfd270522fdc120b4031c1124a
2010-08-30 15:14:06 -07:00
Eric Rowe
6151a9ef23 am f72b0e44: Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread
Merge commit 'f72b0e447296bc07104af62c33c56bc15b7a6677' into gingerbread-plus-aosp

* commit 'f72b0e447296bc07104af62c33c56bc15b7a6677':
  DO NOT MERGE Add A2DP and Headset connection stress tests.
2010-08-30 12:33:52 -07:00
Eric Rowe
f72b0e4472 Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread 2010-08-30 11:37:10 -07:00
Vasu Nori
bfe1dc2794 fix isIntegrityCheck() & add a sample impl class and test for DatabaseErrorHandler
fixed a bug in SQLiteDatabase.isDatabaseIntegrityOk()
and added a new class to demonstrate use of
android.database.DatabaseErrorHandler
and a bunch of nits

Change-Id: Ia81870853fa3bd84074637f6d823a9fd22b66c7e
2010-08-30 10:28:47 -07:00
Kenny Root
818c830c59 am 83285781: am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread
Merge commit '8328578152fbfd23952a6cda4b2e60853d78eb74'

* commit '8328578152fbfd23952a6cda4b2e60853d78eb74':
  Allow native shared libraries in ASEC containers
2010-08-27 18:11:06 -07:00
Kenny Root
8328578152 am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread
Merge commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3' into gingerbread-plus-aosp

* commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3':
  Allow native shared libraries in ASEC containers
2010-08-27 16:45:45 -07:00
Kenny Root
85387d7ba3 Allow native shared libraries in ASEC containers
This change moves the native library handling earlier in the package
installation process so that it may be inserted into ASEC containers
before they are finalized in the DefaultContainerService.

Note that native libraries on SD card requires that vold mount ASEC
containers without the "noexec" flag on the mount point.

Change-Id: Ib34b1886bf6f94b99bb7b3781db6e9b5a58807ba
2010-08-27 16:40:06 -07:00
Eric Rowe
bfa6d1dbe4 am aed5d62a: am 8f5007ba: am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo
Merge commit 'aed5d62ac1278c032528921798529dbd824a1865'

* commit 'aed5d62ac1278c032528921798529dbd824a1865':
  Improve logging and flexibility of BT stress tests.
2010-08-27 15:52:33 -07:00
Eric Rowe
66991b956a DO NOT MERGE Add A2DP and Headset connection stress tests.
Change-Id: I0b8ff3f54d75293b99e53adeda7dd6dea36403b0
2010-08-26 19:59:02 -07:00
Eric Rowe
aed5d62ac1 am 8f5007ba: am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo
Merge commit '8f5007ba4789e0c9e1a620e7211fa24143a66a0a' into gingerbread-plus-aosp

* commit '8f5007ba4789e0c9e1a620e7211fa24143a66a0a':
  Improve logging and flexibility of BT stress tests.
2010-08-26 17:37:00 -07:00
Eric Rowe
8f5007ba47 am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo
Merge commit '163fba0a75dd582aa62187a062faa66d60db0d34' into gingerbread

* commit '163fba0a75dd582aa62187a062faa66d60db0d34':
  Improve logging and flexibility of BT stress tests.
2010-08-26 17:30:28 -07:00
Ben Dodson
58a345936d Added methods for managing uri query parameters
Change-Id: Ic98c1bd159740dd4d895889079f9f2abae4fc2b9
2010-08-26 17:15:01 -07:00
Eric Rowe
e1d666b632 Improve logging and flexibility of BT stress tests.
Change-Id: I657638b3b410175919da545e9a9b7d9df6466362
2010-08-26 15:18:15 -07:00
Daisuke Miyakawa
1922ac108c am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread
Merge commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab' into gingerbread-plus-aosp

* commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab':
  Fix the test breakage in vCard tests.
2010-08-24 18:31:22 -07:00
Daisuke Miyakawa
4d9c1931c9 Fix the test breakage in vCard tests.
- Make custom resolvers use official MockContentProvider instead of
  relying on its own.
- Fix a test which is found to be broken after the fix above.

Bug: 2945326
Change-Id: Ifb14f61771215c103d8825240989eecee73d585a
2010-08-24 18:26:45 -07:00
Wink Saville
c28227d443 Merge "Allow reliable detection of a message that is in use." 2010-08-24 14:33:29 -07:00
Daisuke Miyakawa
28060c8a80 am 6dd19ca5: Merge "Make VCardTestsBase public." into gingerbread
Merge commit '6dd19ca5cb78008d6793d0a223a6189786c5c62f' into gingerbread-plus-aosp

* commit '6dd19ca5cb78008d6793d0a223a6189786c5c62f':
  Make VCardTestsBase public.
2010-08-24 13:39:37 -07:00
Wink Saville
a334e7c724 Allow reliable detection of a message that is in use.
Because the standard Looper.loop code calls Message#recycle it is
imperative that Handler#handleMessage code not attempt to resue
a message it receives. If allowed to do so it will cause bugs that
could be difficult to diagnois.

This change adds Message#flags and uses one bit to reliably detect
a message is in use and throws an error in MessageQueue#enqueueMessage.
This allows early detection of this bug.

Note: This is not new functionality, but the current implementation does
not detect messages that are in use because it uses Message#when != 0
as the detection mechanism. The problem is that a Message#when value of 0
is valid value used to place a message at the front of the queue and is
thus unreliable.

Another option is to change the setting of Message#when in Message#enqueueMessage
so that it is never 0, although that does change subtly a publicly accessible
field.

Yet another option would be to use other fields but all candidates have
similar problems as when in that they are publicly accessible or even
settable such as Message#target.

Change-Id: I040d6e546376f7b1ed1e4daa0d5644cce8bf333a
2010-08-24 10:56:30 -07:00
Vasu Nori
4077d7a75d Merge "SQLiteOpenHelper should discard closed singleton database objects" 2010-08-24 10:08:13 -07:00