drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,129 Commits 1 Branch 0 Tags
Commit Graph

183 Commits

Author SHA1 Message Date
Brett Chabot
a227db53f0 Fix build 
Change-Id: I2dc9acf6310e25f6862236b6e27b4df1e1a012ba
 2010-09-21 16:05:59 -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
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
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
5f53bca55b Adding Download Manager Integration, stress, and hosts-based tests. 
Change-Id: I97008f6cfd95ea9950db0b4e093da02528849b63
 2010-09-08 17:02:53 -07:00
Jean-Baptiste Queru
2cc595af65 Revert "resolve conflicts" 
This reverts commit 84f992a249491b9f755e879bf096baac3f9472f5.
 2010-09-08 11:01:40 -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
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
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
Eric Rowe
ac3c1f550f Add BT test instrumentation for reboot tests. 
Change-Id: If8134a1c11f3982086b7299e5c8bd3ef8eaa5959
 2010-08-31 15:06:58 -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
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
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
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
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
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
Daisuke Miyakawa
0263b0d887 Make VCardTestsBase public. 
Change-Id: I9f1adc6f0b4263424897609b3cc0855e83906407
 2010-08-23 14:51:20 -07:00
Brian Carlstrom
005f0d084e am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread 
Merge commit '4d42ccd1579da53aaaf132a6ad26a06e2baa5b98' into gingerbread-plus-aosp

* commit '4d42ccd1579da53aaaf132a6ad26a06e2baa5b98':
  Tracking merge of dalvik-dev to gingerbread
 2010-08-20 13:54:28 -07:00
Brian Carlstrom
4d42ccd157 Tracking merge of dalvik-dev to gingerbread 
git cherry-pick --no-commit 353ab63e412dd15029143de238e9590ab35eb583)
make update-api

Change-Id: I9e61616828a3a5745421350b9a2fc78ba181d388
 2010-08-20 13:50:19 -07:00
Daisuke Miyakawa
a7bb3ba54a am f996ed9f: Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread 
Merge commit 'f996ed9f2e4a992e5d884077a15dcc23a8d90c44' into gingerbread-plus-aosp

* commit 'f996ed9f2e4a992e5d884077a15dcc23a8d90c44':
  Make vCard importer/exporter aware of multi-byte parameters.
 2010-08-18 13:35:47 -07:00
Daisuke Miyakawa
b7688558cc Make vCard importer/exporter aware of multi-byte parameters. 
Bug: 2922186
Change-Id: Ic877940242d87ef918bf8d4dac601d37b296259b
 2010-08-17 16:40:47 -07:00
Eric Rowe
7cb0fc5880 am edae848e: am 301c437b: Remove @LargeTest annotations 
Merge commit 'edae848eb62e27b8e987aa89557d1456304fada7' into gingerbread-plus-aosp

* commit 'edae848eb62e27b8e987aa89557d1456304fada7':
  Remove @LargeTest annotations
 2010-08-10 12:00:07 -07:00
Eric Rowe
edae848eb6 am 301c437b: Remove @LargeTest annotations 
Merge commit '301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread

* commit '301c437b554e2152f3f6fffadc680f5cbf8e8231':
  Remove @LargeTest annotations
 2010-08-10 11:53:59 -07:00
Brett Chabot
4f94181282 am e967ee49: Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread 
Merge commit 'e967ee49b5a86de2be11dd1d28283c337b01e537' into gingerbread-plus-aosp

* commit 'e967ee49b5a86de2be11dd1d28283c337b01e537':
  Fix gingerbread FrameworkCoreTests makefile.
 2010-08-10 10:30:32 -07:00
Brett Chabot
56718cb1cb Fix gingerbread FrameworkCoreTests makefile. 
android-common should be included as a static library.

Change-Id: I539962904c84ef30e6d7bd1b48d0bc07e0757d58
 2010-08-09 18:49:54 -07:00
Eric Rowe
301c437b55 Remove @LargeTest annotations 
Change-Id: Ib7e6f6e8b6437db5ca2ad2bcb89f079a0cbf7453
 2010-08-09 15:35:48 -07:00
Vasu Nori
bde1fc848d am 499b7438: Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread 
Merge commit '499b743851aa84b9fc1a7e445e189946bc47ad5d' into gingerbread-plus-aosp

* commit '499b743851aa84b9fc1a7e445e189946bc47ad5d':
  (gingerbread) remove unused tests. bug:2898376
 2010-08-05 17:15:08 -07:00
Vasu Nori
286b9770cc (gingerbread) remove unused tests. bug:2898376 
Change-Id: Icc4c8ed20c9e910784bf202415d58e4af2366bee
 2010-08-05 16:56:09 -07:00
Eric Rowe
5c0f1e0a87 am f9ea8ec5: am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo 
Merge commit 'f9ea8ec57e1e1d5654f57c22f514954e242833d2' into gingerbread-plus-aosp

* commit 'f9ea8ec57e1e1d5654f57c22f514954e242833d2':
  Checkin initial bluetooth stress tests.
 2010-08-05 15:18:22 -07:00
Eric Rowe
f9ea8ec57e am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo 
Merge commit '982f1521a662d274eca1216707d874f148396ac6' into gingerbread

* commit '982f1521a662d274eca1216707d874f148396ac6':
  Checkin initial bluetooth stress tests.
 2010-08-05 15:10:15 -07:00
Eric Rowe
14db8d9978 Checkin initial bluetooth stress tests. 
Bluetooth stress tests include stress tests for enabling/disabling bluetooth,
making the device discoverable/undiscoverable, and starting and stopping scans.

Change-Id: Ic8ba09475ffe5551717438673e0ed3f4bd17cf2f
 2010-08-05 14:45:44 -07:00