183 Commits

Author SHA1 Message Date
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
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
Android (Google) Code Review
c20fc77c5a Merge change Iefd4a388 into eclair
* changes:
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 14:56:14 -05:00
Brett Chabot
efd4a388d6 Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
Bug 1840944
2009-10-30 17:45:09 -07:00
Jack Wang
1d225d67d9 am e8228afb: Merge change I92cdc5ed into eclair
Merge commit 'e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-plus-aosp

* commit 'e8228afb2bd005ae25ce58719f9d678389b26a16':
  PerformanceCollector: Collect & report perf measurements in key/value form
2009-10-30 17:07:21 -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
b5b173f9a4 am b81df8e3: Merge change I5535bbdf into eclair
Merge commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56' into eclair-plus-aosp

* commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56':
  Disable flaky and failing tests.
2009-10-26 18:06:48 -07:00
Brett Chabot
5535bbdfc8 Disable flaky and failing tests.
Bugs 2118268, 2176089
2009-10-26 17:44:38 -07:00
Brett Chabot
0c0519cf6d am 76bb9a36: Merge change I1932e8f8 into eclair
Merge commit '76bb9a363633b5741937ebe58b01a8b2024753b0' into eclair-plus-aosp

* commit '76bb9a363633b5741937ebe58b01a8b2024753b0':
  Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
2009-10-20 13:01:55 -07:00
Brett Chabot
1932e8f811 Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
BUG 2170975
2009-10-19 17:34:33 -07:00
Brett Chabot
c417d3b1fd am 773fd131: Merge change I3429f77a into eclair
Merge commit '773fd13130948397cac5178e16d17975a06a738b' into eclair-plus-aosp

* commit '773fd13130948397cac5178e16d17975a06a738b':
  Suppress flaky test HeapTest#testOomeLarge.
2009-10-07 12:00:02 -07:00
Tammo Spalink
8b57231058 am 5c8dba21: Merge change I61aac7b3 into eclair
Merge commit '5c8dba21bf5e6a54f848c2e7f46dc86c27a09102' into eclair-plus-aosp

* commit '5c8dba21bf5e6a54f848c2e7f46dc86c27a09102':
  Add PERIOD char to CDMA address sugar list.
2009-10-07 11:50:39 -07:00
Brett Chabot
b8a4e5f79a Suppress flaky test HeapTest#testOomeLarge.
BUG 2170975
2009-10-06 19:33:24 -07:00
Tammo Spalink
61aac7b377 Add PERIOD char to CDMA address sugar list.
Addresses issue:
http://buganizer/issue?id=2164455
2009-10-05 14:20:06 +08:00
Hung-ying Tyan
4c0d406d56 am 2df1cc43: Merge change I42a80783 into eclair
Merge commit '2df1cc437793d50609c575881c04cc2c63d0bd97' into eclair-plus-aosp

* commit '2df1cc437793d50609c575881c04cc2c63d0bd97':
  Remove deprecated VpnType.getDescription().
2009-09-30 03:50:30 -07:00
Hung-ying Tyan
865a1bbf36 Remove deprecated VpnType.getDescription(). 2009-09-30 18:39:48 +08:00
johnwang
f776012426 am 9c118c80: Update CID in NeighboringCellInfo
Merge commit '9c118c80fd0a5416051f2a49f515301f2cf3fd6f' into eclair-plus-aosp

* commit '9c118c80fd0a5416051f2a49f515301f2cf3fd6f':
  Update CID in NeighboringCellInfo
2009-09-25 13:44:42 -07:00
johnwang
9c118c80fd Update CID in NeighboringCellInfo
NeighboringCellInfo works in GSM and UMTS network.

In GSM network, the locaiton value is the combination of LAC and CID.

In UMTS network, the locaiton value is PSC code.

NeighboringCellInfo should access and store those two values seperately.

It involves the change of Public API.

1. Add new API getRadioType(), getLac(), and getPsc() to get location info in GSM and UMTS.

2. Deprecate setCid() and NeighboringCellInfo(int cid) because cid is set by interpreting network type.
2009-09-25 12:17:46 -07:00
Tammo Spalink
a1e350eadc am b89cfb0f: Merge change 26566 into eclair
Merge commit 'b89cfb0f9db2b1a4655c5e78e5c57855b5a78ee9' into eclair-plus-aosp

* commit 'b89cfb0f9db2b1a4655c5e78e5c57855b5a78ee9':
  Conditionalized CDMA-specific test.
2009-09-23 21:50:40 -07:00
Tammo Spalink
af8e23fe9e Conditionalized CDMA-specific test.
Addresses issue:
http://b/issue?id=2122045

Change-Id: Ia43e254f0808e1d96cbd240101eee621979e9100
2009-09-24 12:29:16 +08:00
Wei Huang
7bcf59c43d am a1dfa7f4: Merge change 26550 into eclair
Merge commit 'a1dfa7f4a108a7823d8da49ba5ea1777e283a724' into eclair-plus-aosp

* commit 'a1dfa7f4a108a7823d8da49ba5ea1777e283a724':
  fix bug 2134367: failing phone number compare test.
2009-09-22 22:10:22 -07:00
Wei Huang
409308617f fix bug 2134367: failing phone number compare test.
Change-Id: Iccc3b69cd1e4bdb82da48d87d610e4a45ae31601
2009-09-22 21:52:41 -07:00
Daisuke Miyakawa
4d9a5cc45c am a13ccc90: Merge change 26175 into eclair
Merge commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a' into eclair-plus-aosp

* commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a':
  Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer.
2009-09-21 10:58:23 -07:00
Daisuke Miyakawa
6a857d957e Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer.
Uguu.

Internal issue number: 2134367
2009-09-21 10:49:44 -07:00
Daniel Sandler
bf72ec17bf am e5a6d16f: Merge change 25785 into eclair
Merge commit 'e5a6d16f26543061a0fc815ba90644a44995e025' into eclair-plus-aosp

* commit 'e5a6d16f26543061a0fc815ba90644a44995e025':
  Fix http://b/2126318 (density test fails due to wrong-size asset stripping)
2009-09-18 13:59:38 -07:00
Daniel Sandler
da06e32e4c Fix http://b/2126318 (density test fails due to wrong-size asset stripping)
The density test expects all resources of all densities to be included, but specifying a density for a particular device build kills that. We therefore add all the required densities explicitly to the Makefile to compensate.
2009-09-18 15:12:07 -04:00
Dianne Hackborn
ca1475a868 am 8843620c: Merge change 25360 into eclair
Merge commit '8843620cb208904bb9583809c9cfbe9e41264ae0' into eclair-plus-aosp

* commit '8843620cb208904bb9583809c9cfbe9e41264ae0':
  Fix issue #2121993: com.android.unit_tests.os.HandlerThreadTest:testHandlerThread is failing
2009-09-17 08:42:13 -07:00
Jean-Baptiste Queru
e525eef4b8 merge from open-source master 2009-09-16 16:22:13 -07:00
Dianne Hackborn
207700d857 Fix issue #2121993: com.android.unit_tests.os.HandlerThreadTest:testHandlerThread is failing
Change-Id: I5f2cc8b39d3f15782e5fbf47015be9f4fa94a65b
2009-09-16 15:10:30 -07:00
Android (Google) Code Review
6d9eebe732 Merge change 25090 into eclair
* changes:
  Move backlight brightness from HardwareService to PowerManager
2009-09-15 15:50:51 -04:00
Mike Lockwood
237a29923a Move backlight brightness from HardwareService to PowerManager
to prevent apps from changing the hardware behind its back.
Fixes b/2041941 Lock screen flashes the screen very bright before dimming

Change-Id: Ice757f7ae87902bdfb3634471cf44f020ebfaae4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-15 15:47:09 -04:00
Brett Chabot
0393d349be Fix FileObserverTest#testRun.
The assertion in the test was expecting 4 events, but it was only waiting for
three.

BUG 2119135
2009-09-15 11:07:33 -07:00
Kenny Root
fc01794f33 Make Uri.parseUserPart, parseHost, and parsePort symmetric
Currently parseUserPart uses the encoded authority to split the URI
into user and non-user parts, but the parseHost and parsePort uses
the decoded URI to split the URI into non-host, host, and port parts.
This gives unexpected results when %40 ('@') and %3a (':') is used
in a URI:

Uri test = Uri.parse("http://bob%40lee%3ajr@example.com:42/");
test.getUserInfo() => "bob@lee:jr"
test.getHost() => "lee:jr@example.com" (should be "example.com")
test.getPort() => -1 (should be 42)
2009-09-14 17:45:04 -07:00
Jack Wang
ff1df69dd4 Performance measurement framework:
+ For bug 1810508
  - Added PerformanceCollector class to collect runtime and memory usage data
    * Moved performance snapshotting from Intrumentation to PerformanceCollector
  - Added PerformanceResultsWriter interface which defines functions for
    reporting performance data

+ Framework integration
  - Added TimedTest annotation to automatically time tests and write results
    to instrumentation output
  - Modified PerformanceTestBase to add collection hooks and wrapper methods
  - Modified WatcherResultPrinter in InstrumentationTestRunner to implement
    PerformanceResultsWriter for instrumentation output of performance data
  - Modified InstrumentationTestRunner and AndroidTestRunner to pass writer
    instance to test
2009-09-11 17:15:15 -07:00
Tammo Spalink
2af198bba1 Fix broken GSM SMS unit test, and general cleanup.
Addresses issues:
http://buganizer/issue?id=2059500
http://buganizer/issue?id=2056263

Change-Id: If1cb1e2b326419de695cbaa8a995e6bafb56447f
2009-09-07 16:16:10 +08:00
Tammo Spalink
259749c674 Rename SMSTest to GsmSmsTest.
Change-Id: I7ef602bd52167fd9f0712b1ce560e72a78f67193
2009-09-07 16:12:57 +08:00
Robert Greenwalt
1c1ffa0cab Promote MccTable to telephony and use it for both gsm/cdma
This adds timezone/locale/wifi-regulator-channels initialization to cdma (gsm already had it).

bug: 2071211
2009-09-03 12:34:15 -07:00
Jean-Baptiste Queru
8f4b5a5618 donut snapshot 2009-09-02 13:39:46 -07:00
Tammo Spalink
95434bfaee Allow fragmentText to be called for singleton CDMA messages.
Corrects for previous partner changes, addressing issue:

http://buganizer/issue?id=2063332

Change-Id: I49e564d81c5db3e92a6bad973f21a02a7302875d
2009-09-01 11:44:08 +08:00
Android (Google) Code Review
650cbfd381 Merge change 22551 into eclair
* changes:
  Fix broken unit test.
2009-08-31 19:39:40 -07:00
Tammo Spalink
f73dc54541 Fix broken unit test.
Addresses issues:
http://buganizer/issue?id=2056263
http://buganizer/issue?id=2058622

Change-Id: I951fabddbb141f86d5126b908fdff80fbf3b4d7e
2009-08-31 18:54:18 +08:00
Brett Chabot
1615ccc8a4 am e1df8224: Merge change 23173 into donut
Merge commit 'e1df82248a68282a4d556ce61db09949fc186827' into eclair

* commit 'e1df82248a68282a4d556ce61db09949fc186827':
  Remove flaky test LifecycleTest.testDialog from large continuous suite.
2009-08-28 13:50:16 -07:00
Brett Chabot
3bb99b3adf Remove flaky test LifecycleTest.testDialog from large continuous suite.
BUG 1866891

Change-Id: Ifef98426cf3879fc9f17aa5a0891578fefa54ce3
2009-08-28 13:42:10 -07:00
Tammo Spalink
c18776d5bc optimize MCC table
Replace a table of objects that was created at boot
in a costly manner, with a pre-generated table of
more densely formatted numerical data.

Based on data from runhat on the phone process,
this looks to shrink the memory footprint from about
16kB to less then 2kB.

Addresses http://buganizer/issue?id=874072

Change-Id: I5a7b9d7de4c9b9a0360e8370252582969fbd8d4f
2009-08-28 14:05:04 +08:00
Daisuke Miyakawa
f4ddea7690 Refactor VCard handling code, phase 2, 3, 4, 5
Phase 2
Make VCard Importer use Data structures in ContactsContract instead of
using old Conatacts structure.

Phase 3
Developed VCardComposer, which was originally in Contacts package, but
now in base/core/java. Also made it use queryEntries() as per jsharkey's
suggestion.

Phase 4
Added VCardUtils and moved some common methods to it, some of which should be
in public API, but hidden for now.

Phase 5
Made VCardComposer emits (almost) valid vCard 3.0 data.
Confirmed with vCard data emitted by Mac.

Related issue:
1784580, 1728351, 1967349

Note:
Probable next step:
- Add "fast parse" mode in VCradBuilder, in which, VCardBuilder skip parsing the value of
each property. It will make the parsing faster.
-- Note that parsing the parameters of each entry cannot be skipped, since it may contains
the information about Encoding of the property. In other words, if the line is
in Quoted-Printable format, the next line may be the part of the property, not a
separated property, which should be parsed accordingly.

- Needs test
2009-08-25 15:39:06 +09:00
Fred Quintana
ffd0cb04f9 do not merge: cherrypicked 3710f390968e683a0ad3adf0b517dfcade3564ce from master branch 2009-08-15 22:40:25 -07:00
Jean-Baptiste Queru
ac1e59d887 donut snapshot 2009-08-11 13:12:34 -07:00
Tammo Spalink
e00dd1e5a3 Make GSM 7-bit encoding properly deal with initial padding.
For CDMA, clean up the GSM encapsulation to properly align
user data payload after the user data header.

Addresses http://buganizer/issue?id=2007011
2009-08-10 14:12:35 +08:00
Android (Google) Code Review
3905eb3d2f am ff6585cb: Merge change 20144 into donut
Merge commit 'ff6585cbb0e5e42adf056b4a074b9f3683b853c1'

* commit 'ff6585cbb0e5e42adf056b4a074b9f3683b853c1':
  Remove flaky MonitorTest#testInterrupt from continuous, and attempt to make
2009-08-05 17:52:10 -07:00