Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,612 Commits 3 Branches 0 Tags
948415fdd9bfee77aa46deae76f8602788befe6d
Commit Graph

247 Commits

Author SHA1 Message Date
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
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
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
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
Brett Chabot
efd4a388d6 Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles 
Bug 1840944
 2009-10-30 17:45:09 -07:00
Jack Wang
227ba2072d am e8228afb: Merge change I92cdc5ed into eclair 
Merge commit 'e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-mr2

* commit 'e8228afb2bd005ae25ce58719f9d678389b26a16':
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-10-30 17:07:56 -07:00
Daisuke Miyakawa
8a6219660d am d7185d0b: am f5633bc7: Fix test breakage in testNickNameV21(). 
Merge commit 'd7185d0bd250ff5f006ea94d305539ac7d499977'

* commit 'd7185d0bd250ff5f006ea94d305539ac7d499977':
  Fix test breakage in testNickNameV21().
 2009-10-29 02:01:46 -07:00
Daisuke Miyakawa
636d5629c5 am aa06a0e0: am 3c828e24: Merge change I9195a354 into eclair-mr2 
Merge commit 'aa06a0e086d57ad3a0d063dfb5ab2cfb7936e4b4'

* commit 'aa06a0e086d57ad3a0d063dfb5ab2cfb7936e4b4':
  Add partial support of Android-specific properties.
 2009-10-29 02:00:59 -07:00
Dan Egnor
11e3364a6a am 473bbd21: am 95240270: Instead of a raw AIDL interface, give DropBox a Java interface (android.os.DropBox); move the Binder interface behind the scenes. Make DropBoxEntry into DropBox.Entry. Make it possible to get a dropbox from an (Application)Context with the u 
Merge commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff'

* commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff':
  Instead of a raw AIDL interface, give DropBox a Java
 2009-10-29 02:00:36 -07:00
Brett Chabot
6965720df4 am 32be57d1: am 622b190c: am b81df8e3: Merge change I5535bbdf into eclair 
Merge commit '32be57d1000df0356f19eab01bbf828510d488f6'

* commit '32be57d1000df0356f19eab01bbf828510d488f6':
  Disable flaky and failing tests.
 2009-10-28 23:52:43 -07:00
Daisuke Miyakawa
d7185d0bd2 am f5633bc7: Fix test breakage in testNickNameV21(). 
Merge commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b' into eclair-mr2-plus-aosp

* commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b':
  Fix test breakage in testNickNameV21().
 2009-10-28 23:33:21 -07:00
Daisuke Miyakawa
aa06a0e086 am 3c828e24: Merge change I9195a354 into eclair-mr2 
Merge commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0' into eclair-mr2-plus-aosp

* commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0':
  Add partial support of Android-specific properties.
 2009-10-28 23:32:41 -07:00
Dan Egnor
473bbd2140 am 95240270: Instead of a raw AIDL interface, give DropBox a Java interface (android.os.DropBox); move the Binder interface behind the scenes. Make DropBoxEntry into DropBox.Entry. Make it possible to get a dropbox from an (Application)Context with the usual getSyste 
Merge commit '952402704a175ba27f6c89dff1ada634c5ce5626' into eclair-mr2-plus-aosp

* commit '952402704a175ba27f6c89dff1ada634c5ce5626':
  Instead of a raw AIDL interface, give DropBox a Java
 2009-10-28 23:32:21 -07:00
Daisuke Miyakawa
f5633bc7e2 Fix test breakage in testNickNameV21(). 
Internal issue number: 2079082
 2009-10-29 12:24:26 +09:00
Android (Google) Code Review
3c828e24a9 Merge change I9195a354 into eclair-mr2 
* changes:
  Add partial support of Android-specific properties.
 2009-10-28 21:54:29 -04:00
Daisuke Miyakawa
837cba33c5 Add partial support of Android-specific properties. 
In the near future, all the values which cannot be converted to
vCard property is expressed as "X-ANDROID-CUSTOM" property + MIME_TYPE.

Example (Nick name):
X-ANDROID-CUSTOM:vnd.android.cursor.item/nickname;Nicky;;;;;;;;;;;;;

All the data are stored ordered by its column name ("data1" - "data15").
Currently the code assumes the max num is 15.

Internal Issue number: 2079082
 2009-10-29 09:16:31 +09:00
Dan Egnor
952402704a Instead of a raw AIDL interface, give DropBox a Java 
interface (android.os.DropBox); move the Binder interface
behind the scenes.  Make DropBoxEntry into DropBox.Entry.
Make it possible to get a dropbox from an (Application)Context
with the usual getSystemService(DROPBOX_SERVICE) type thing.
Update the tests accordingly.
 2009-10-28 15:49:11 -07:00
Jack Wang
075997f12e PerformanceCollector: Collect & report perf measurements in key/value form 
- Added new functions to PerformanceCollector and PerformanceResultsWriter
- Modified unit tests to test new functionality and fix flakiness reported in
  2218327 and 2118268
- Added PerformanceCollectorTest to small suite
 2009-10-28 14:32:05 -07:00
Brett Chabot
32be57d100 am 622b190c: am b81df8e3: Merge change I5535bbdf into eclair 
Merge commit '622b190c878e38468096ef0fe1cd28dbc10c3b33' into eclair-mr2-plus-aosp

* commit '622b190c878e38468096ef0fe1cd28dbc10c3b33':
  Disable flaky and failing tests.
 2009-10-28 12:43:52 -07:00
Brett Chabot
622b190c87 am b81df8e3: Merge change I5535bbdf into eclair 
Merge commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56' into eclair-mr2

* commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56':
  Disable flaky and failing tests.
 2009-10-28 11:37:42 -07:00
Daisuke Miyakawa
e4ce6a5c22 am 1cb34d48: am bb88e3ad: Move verification code to VCardTestsBase. 
Merge commit '1cb34d4850ec807eda5742ecad8b7469b98173d8'

* commit '1cb34d4850ec807eda5742ecad8b7469b98173d8':
  Move verification code to VCardTestsBase.
 2009-10-26 22:44:36 -07:00
Daisuke Miyakawa
1cb34d4850 am bb88e3ad: Move verification code to VCardTestsBase. 
Merge commit 'bb88e3ad568a05cc816fa786fcf1902fa9497499' into eclair-mr2-plus-aosp

* commit 'bb88e3ad568a05cc816fa786fcf1902fa9497499':
  Move verification code to VCardTestsBase.
 2009-10-26 22:33:57 -07:00
Daisuke Miyakawa
bb88e3ad56 Move verification code to VCardTestsBase. 
Internal Issue number: 2195990, 2079082
 2009-10-27 12:52:23 +09:00