813 Commits

Author SHA1 Message Date
Derek Sollenberger
6f240aec18 am 29c00b0f: am 521123e0: Merge change I9e28c4ce into eclair-mr2
Merge commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf'

* commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf':
  Allow plugins to load java classes from their apk.
2009-11-09 13:51:18 -08:00
Derek Sollenberger
29c00b0f09 am 521123e0: Merge change I9e28c4ce into eclair-mr2
Merge commit '521123e0ed91348be81d3d754d3ee13ecf454ced' into eclair-mr2-plus-aosp

* commit '521123e0ed91348be81d3d754d3ee13ecf454ced':
  Allow plugins to load java classes from their apk.
2009-11-09 12:45:29 -08:00
Daisuke Miyakawa
6ddfe00729 am c53cc103: am 0e983864: Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and "AGENT" line.
Merge commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e'

* commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e':
  Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
2009-11-09 12:12:24 -08:00
Daisuke Miyakawa
c53cc10390 am 0e983864: Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and "AGENT" line.
Merge commit '0e983864fca215513de9664573dcc3bbadf41e79' into eclair-mr2-plus-aosp

* commit '0e983864fca215513de9664573dcc3bbadf41e79':
  Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
2009-11-09 12:04:03 -08:00
Derek Sollenberger
9e28c4ce66 Allow plugins to load java classes from their apk.
Provide the functions to be called from native code that take
the plugin's location and desired class name and then load that
class from the plugin's apk if it is available.

see http://b/2215696
2009-11-09 14:45:58 -05:00
Daisuke Miyakawa
0e983864fc Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
"AGENT" line.

Internal Issue number: 2247192
2009-11-09 15:34:55 +09:00
jsh
c184a41ecf am 36704bb8: am 91abf105: am b90a187d: Merge change Ie994c0e8 into eclair
Merge commit '36704bb8ffd433450994c0260c411bfa9424326d'

* commit '36704bb8ffd433450994c0260c411bfa9424326d':
  Update CdmaSmsTest unit test.
2009-11-06 13:43:02 -08:00
jsh
36704bb8ff am 91abf105: am b90a187d: Merge change Ie994c0e8 into eclair
Merge commit '91abf105206f2ba19e886909456b3e3b7ed19362' into eclair-mr2-plus-aosp

* commit '91abf105206f2ba19e886909456b3e3b7ed19362':
  Update CdmaSmsTest unit test.
2009-11-06 13:35:20 -08:00
jsh
91abf10520 am b90a187d: Merge change Ie994c0e8 into eclair
Merge commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595' into eclair-mr2

* commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595':
  Update CdmaSmsTest unit test.
2009-11-06 13:23:15 -08:00
jsh
7d8ef2517c am b90a187d: Merge change Ie994c0e8 into eclair
Merge commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595' into eclair-plus-aosp

* commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595':
  Update CdmaSmsTest unit test.
2009-11-06 13:03:05 -08:00
jsh
1e1c24bed2 Update CdmaSmsTest unit test.
Forgot to do this with previous check in.  Now that calculateLength() has
been fixed to match the actual encoding (ie, doesn't support single-segment
EMS), test case needs to be updated.

Fixes b/2244483
2009-11-06 11:55:19 -08:00
Joe Onorato
8c56a63fb0 am 178b6c91: am c92196f6: am c3f3f9a9: Merge change Ie71d9e42 into eclair
Merge commit '178b6c91bcc6a77643f4a5f7939c2120ad41b977'

* commit '178b6c91bcc6a77643f4a5f7939c2120ad41b977':
  Another test for StatusBar test.
2009-11-05 20:57:22 -08:00
Joe Onorato
178b6c91bc am c92196f6: am c3f3f9a9: Merge change Ie71d9e42 into eclair
Merge commit 'c92196f6932571ddd8b353dd9c9bb37245e3e2de' into eclair-mr2-plus-aosp

* commit 'c92196f6932571ddd8b353dd9c9bb37245e3e2de':
  Another test for StatusBar test.
2009-11-05 20:37:38 -08:00
Joe Onorato
c92196f693 am c3f3f9a9: Merge change Ie71d9e42 into eclair
Merge commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c' into eclair-mr2

* commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c':
  Another test for StatusBar test.
2009-11-05 20:28:10 -08:00
Joe Onorato
d227f8102a am c3f3f9a9: Merge change Ie71d9e42 into eclair
Merge commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c' into eclair-plus-aosp

* commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c':
  Another test for StatusBar test.
2009-11-05 19:26:17 -08:00
Android (Google) Code Review
c3f3f9a90b Merge change Ie71d9e42 into eclair
* changes:
  Another test for StatusBar test.
2009-11-05 22:20:02 -05:00
Guang Zhu
901267c08f am 6f116319: am 1c7be08f: am bfa68abc: layout test rebase, bug fix
Merge commit '6f116319367539e3972747da9d300467840f8b2d'

* commit '6f116319367539e3972747da9d300467840f8b2d':
  layout test rebase, bug fix
2009-11-05 16:04:21 -08:00
Guang Zhu
6f11631936 am 1c7be08f: am bfa68abc: layout test rebase, bug fix
Merge commit '1c7be08f6bc22d3718fd8bc9f9f5a0426ba17a77' into eclair-mr2-plus-aosp

* commit '1c7be08f6bc22d3718fd8bc9f9f5a0426ba17a77':
  layout test rebase, bug fix
2009-11-05 15:57:38 -08:00
Guang Zhu
1c7be08f6b am bfa68abc: layout test rebase, bug fix
Merge commit 'bfa68abc955ed1fe6cf6d98e42f344a8d623fab7' into eclair-mr2

* commit 'bfa68abc955ed1fe6cf6d98e42f344a8d623fab7':
  layout test rebase, bug fix
2009-11-05 15:47:32 -08:00
Guang Zhu
13f91e06b8 am bfa68abc: layout test rebase, bug fix
Merge commit 'bfa68abc955ed1fe6cf6d98e42f344a8d623fab7' into eclair-plus-aosp

* commit 'bfa68abc955ed1fe6cf6d98e42f344a8d623fab7':
  layout test rebase, bug fix
2009-11-05 15:47:29 -08:00
Guang Zhu
bfa68abc95 layout test rebase, bug fix
* rebase layout test based on newly enabled http tests
* fix a bug in initializing parameters (should happen before super.onCreate)
2009-11-05 15:28:15 -08:00
Joe Onorato
e71d9e421d Another test for StatusBar test. 2009-11-05 17:12:18 -05:00
Daisuke Miyakawa
f53b829132 am 931203d4: am dc0f9efd: Merge change I0d442f0d into eclair-mr2
Merge commit '931203d4052ad9e02cc0a49b5d6b68c44e4d4072'

* commit '931203d4052ad9e02cc0a49b5d6b68c44e4d4072':
  Add tests for Japanization part of vCard.
2009-11-04 21:06:54 -08:00
Daisuke Miyakawa
931203d405 am dc0f9efd: Merge change I0d442f0d into eclair-mr2
Merge commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3' into eclair-mr2-plus-aosp

* commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3':
  Add tests for Japanization part of vCard.
2009-11-04 20:57:35 -08:00
Daisuke Miyakawa
4fe2c57c3c Add tests for Japanization part of vCard.
Fix several bugs around name construction.

Internal issue number: 2195990
2009-11-05 13:47:48 +09:00
Daisuke Miyakawa
87ec42a5fc am 7557e547: am 5dbeef6e: Merge change I76588b56 into eclair-mr2
Merge commit '7557e54700d266f6c44a4ed5c13c52a67599cbe3'

* commit '7557e54700d266f6c44a4ed5c13c52a67599cbe3':
  Make vCard importer handle "PAGER" phone number correctly.
2009-11-04 17:08:16 -08:00
Daisuke Miyakawa
7557e54700 am 5dbeef6e: Merge change I76588b56 into eclair-mr2
Merge commit '5dbeef6e9844a094f87a3f7d4608b431a6724278' into eclair-mr2-plus-aosp

* commit '5dbeef6e9844a094f87a3f7d4608b431a6724278':
  Make vCard importer handle "PAGER" phone number correctly.
2009-11-04 16:54:20 -08:00
Daisuke Miyakawa
26ee0ae9de Make vCard importer handle "PAGER" phone number correctly.
Add tests for it.

Internal issue number: 2239492
2009-11-05 09:44:42 +09:00
Brett Chabot
a7dd26bf61 am dcef5348: am 8742696b: am c20fc77c: Merge change Iefd4a388 into eclair
Merge commit 'dcef5348f4457b20bcf29b8754a07160ea572372'

* commit 'dcef5348f4457b20bcf29b8754a07160ea572372':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 13:46:28 -08:00
Brett Chabot
dcef5348f4 am 8742696b: am c20fc77c: Merge change Iefd4a388 into eclair
Merge commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4' into eclair-mr2-plus-aosp

* commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 13:23:28 -08:00
Brett Chabot
d09ed4bbc0 am c20fc77c: Merge change Iefd4a388 into eclair
Merge commit 'c20fc77c5a2bb8483f2e6e8b4064853804502365' into eclair-plus-aosp

* commit 'c20fc77c5a2bb8483f2e6e8b4064853804502365':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 12:05:55 -08:00
Brett Chabot
8742696b0d am c20fc77c: Merge change Iefd4a388 into eclair
Merge commit 'c20fc77c5a2bb8483f2e6e8b4064853804502365' into eclair-mr2

* commit 'c20fc77c5a2bb8483f2e6e8b4064853804502365':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 12:05:45 -08:00
Android (Google) Code Review
c20fc77c5a Merge change Iefd4a388 into eclair
* changes:
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 14:56:14 -05:00
Daisuke Miyakawa
1f2f501c1d am ffe9b571: am f035b477: Make test compontent support multiple vCard input.
Merge commit 'ffe9b571bc8f299ac9198e00741c612dbd8d5934'

* commit 'ffe9b571bc8f299ac9198e00741c612dbd8d5934':
  Make test compontent support multiple vCard input.
2009-11-04 05:12:40 -08:00
Daisuke Miyakawa
ffe9b571bc am f035b477: Make test compontent support multiple vCard input.
Merge commit 'f035b47774aabf7397aec5c5459ac9860ad63bab' into eclair-mr2-plus-aosp

* commit 'f035b47774aabf7397aec5c5459ac9860ad63bab':
  Make test compontent support multiple vCard input.
2009-11-04 05:02:50 -08:00
Daisuke Miyakawa
f035b47774 Make test compontent support multiple vCard input.
Internal issue number: 2195990
2009-11-04 21:51:54 +09:00
Daisuke Miyakawa
cb1f7b6784 am 32fd3a00: am 231e01e7: Merge change I202c3106 into eclair-mr2
Merge commit '32fd3a004366092878a2ee3923d6cbed27cd28db'

* commit '32fd3a004366092878a2ee3923d6cbed27cd28db':
  Make ContentValuesBuilder a separate file.
2009-11-03 16:27:59 -08:00
Daisuke Miyakawa
c064a36770 am 7113f59d: am d14ea3c7: Merge change If338e940 into eclair-mr2
Merge commit '7113f59de3ccf8ba5a48273e8e6b7b8138a31f99'

* commit '7113f59de3ccf8ba5a48273e8e6b7b8138a31f99':
  Introduce ContentValuesBuilder and make tests easier to read.
2009-11-03 16:27:29 -08:00
Daisuke Miyakawa
32fd3a0043 am 231e01e7: Merge change I202c3106 into eclair-mr2
Merge commit '231e01e7922abae0b33f0aec95275a5cc1b0209d' into eclair-mr2-plus-aosp

* commit '231e01e7922abae0b33f0aec95275a5cc1b0209d':
  Make ContentValuesBuilder a separate file.
2009-11-03 16:22:18 -08:00
Daisuke Miyakawa
9db07dd6b5 Make ContentValuesBuilder a separate file.
Internal issue number: 2195990
2009-11-04 09:10:31 +09:00
Daisuke Miyakawa
7113f59de3 am d14ea3c7: Merge change If338e940 into eclair-mr2
Merge commit 'd14ea3c7d7278695b9c51c243949de88cf38a1a4' into eclair-mr2-plus-aosp

* commit 'd14ea3c7d7278695b9c51c243949de88cf38a1a4':
  Introduce ContentValuesBuilder and make tests easier to read.
2009-11-03 15:42:06 -08:00
Daisuke Miyakawa
ed2d7c42fc Introduce ContentValuesBuilder and make tests easier to read.
Internal Issue number: 2195990
2009-11-04 08:35:41 +09:00
Daisuke Miyakawa
f1072c568e am e7a5141c: am 66da163d: Move some useful logic to VCardTestsBase.java
Merge commit 'e7a5141c0db324ab17b0b5f316463cc8a6a3c36a'

* commit 'e7a5141c0db324ab17b0b5f316463cc8a6a3c36a':
  Move some useful logic to VCardTestsBase.java
2009-11-03 00:10:08 -08:00
Daisuke Miyakawa
e7a5141c0d am 66da163d: Move some useful logic to VCardTestsBase.java
Merge commit '66da163d4115688a8be7abb96c409a9858f9a8cd' into eclair-mr2-plus-aosp

* commit '66da163d4115688a8be7abb96c409a9858f9a8cd':
  Move some useful logic to VCardTestsBase.java
2009-11-03 00:04:43 -08:00
Daisuke Miyakawa
66da163d41 Move some useful logic to VCardTestsBase.java
Internal issue number: 2195990
2009-11-03 16:53:58 +09:00
Daisuke Miyakawa
d026204817 am 648feb77: am 3f16be20: Enable vCard tests connect both importer/exporter tests.
Merge commit '648feb772445eeaf31fcee6a020e43645411c534'

* commit '648feb772445eeaf31fcee6a020e43645411c534':
  Enable vCard tests connect both importer/exporter tests.
2009-11-01 22:45:52 -08:00
Daisuke Miyakawa
648feb7724 am 3f16be20: Enable vCard tests connect both importer/exporter tests.
Merge commit '3f16be2061ddf8daeed959c6e06db9cf561ae304' into eclair-mr2-plus-aosp

* commit '3f16be2061ddf8daeed959c6e06db9cf561ae304':
  Enable vCard tests connect both importer/exporter tests.
2009-11-01 22:36:02 -08:00
Daisuke Miyakawa
3f16be2061 Enable vCard tests connect both importer/exporter tests.
Fix a bug in ContactStruct.

Internal issue number: 2195990
2009-11-02 15:25:23 +09:00
Jack Wang
a64f95639f am af93c05c: am 227ba207: am e8228afb: Merge change I92cdc5ed into eclair
Merge commit 'af93c05c9a25018daf375094c8e697b83795b2d4'

* commit 'af93c05c9a25018daf375094c8e697b83795b2d4':
  PerformanceCollector: Collect & report perf measurements in key/value form
2009-11-01 21:56:33 -08:00
Jack Wang
af93c05c9a am 227ba207: am e8228afb: Merge change I92cdc5ed into eclair
Merge commit '227ba2072df1474a0b3abaae7c415f152d32bcc2' into eclair-mr2-plus-aosp

* commit '227ba2072df1474a0b3abaae7c415f152d32bcc2':
  PerformanceCollector: Collect & report perf measurements in key/value form
2009-10-30 18:41:08 -07:00