Commit Graph

43661 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
6126eafdca reconcile donut snapshot
Merge branch 'donut-snapshot' into HEAD
2009-05-20 11:28:11 -07:00
Jean-Baptiste Queru
a3fdaf3cc2 donut snapshot 2009-05-20 11:28:04 -07:00
Brett Chabot
bae7b44afb am e7a02b24: Revert "Change cts tests to use InstrumentationTestRunner."
Merge commit 'e7a02b243e27420df5273e0276442225dd50839e'

* commit 'e7a02b243e27420df5273e0276442225dd50839e':
  Revert "Change cts tests to use InstrumentationTestRunner."
2009-05-20 08:54:20 -07:00
Brett Chabot
e7a02b243e Revert "Change cts tests to use InstrumentationTestRunner."
This reverts commit 665f512ebc.
2009-05-19 18:08:05 -07:00
Android (Google) Code Review
2f0966479e am 22662ef2: Merge change 1706 into donut
Merge commit '22662ef236cc99f0c19f450d9209da961c4868da'

* commit '22662ef236cc99f0c19f450d9209da961c4868da':
  Change cts tests to use InstrumentationTestRunner.
2009-05-14 17:24:22 -07:00
Brett Chabot
665f512ebc Change cts tests to use InstrumentationTestRunner. 2009-05-14 15:55:21 -07:00
Phil Dubach
084f0ffb22 am aedc07c: am e480582: AI 148455: CTS: Change tests in Android plan to
Merge commit 'aedc07c0ed19dca06e48446921bdd231b7bc99f6'

* commit 'aedc07c0ed19dca06e48446921bdd231b7bc99f6':
  AI 148455: CTS: Change tests in Android plan to use new InstrumentationCtsTestRunner
2009-05-07 10:37:59 -07:00
Phil Dubach
aedc07c0ed am e480582: AI 148455: CTS: Change tests in Android plan to use new Inst
Merge commit 'e480582d829a87e2d7097cb79b7afb9e4ccbf74a' into donut

* commit 'e480582d829a87e2d7097cb79b7afb9e4ccbf74a':
  AI 148455: CTS: Change tests in Android plan to use new InstrumentationCtsTestRunner
2009-05-07 10:34:59 -07:00
Phil Dubach
e480582d82 AI 148455: CTS: Change tests in Android plan to use new InstrumentationCtsTestRunner
BUG=1537738

Automated import of CL 148455
2009-05-07 10:34:41 -07:00
Dianne Hackborn
b771a49a30 merged b1d251acd2 2009-05-06 00:28:37 -07:00
Dianne Hackborn
b1d251acd2 Rewrite SyncStorageEngine to use flat files and in-memory data structures.
The previous implementation used a database for storing all of its state, which could cause
a significant amount of IO activity as its tables were updated through the stages of a sync.
This new implementation replaces that in-memory data structures, with hand-written code
for writing them to persistent storage.

There are now 4 files associated with this class, holding various pieces of its state that
should be consistent.  These are everything from a main XML file of account information that
must always be retained, to a binary file of per-day statistics that can be thrown away at
any time.  Writes of these files as scheduled at various times based on their importance of
the frequency at which they change.

Because the database no longer exists, there needs to be a new explicit interface for
interacting with the sync manager database.  This is provided by new APIs on IContentService,
with a hidden method on ContentResolver to retrieve the IContentService so that various
system entities can use it.  Other changes in other projects are required to update to the
new API.

The goal here is to have as little an impact on the code and functionality outside of
SyncStorageEngine, though due to the necessary change in API it is still somewhat extensive.
2009-05-05 15:40:53 -07:00
Scott Su
05536f876d am 2f57a8b: am 68b8cda: AI 148053: CTS: fixed failed testcases
Merge commit '2f57a8b13618eb1cda6be49d16c90e0def12736b'

* commit '2f57a8b13618eb1cda6be49d16c90e0def12736b':
  AI 148053: CTS: fixed failed testcases
2009-04-30 17:23:06 -07:00
Scott Su
2f57a8b136 am 68b8cda: AI 148053: CTS: fixed failed testcases
Merge commit '68b8cda17af0cb88732ddbc264cfbeab86304d9b' into donut

* commit '68b8cda17af0cb88732ddbc264cfbeab86304d9b':
  AI 148053: CTS: fixed failed testcases
2009-04-30 17:09:23 -07:00
Scott Su
68b8cda17a AI 148053: CTS: fixed failed testcases
Automated import of CL 148053
2009-04-30 16:53:23 -07:00
Scott Su
0ce129ac17 am cd3f1ce: am 0f009ff: AI 147986: Change CTS tests to use Instrumentati
Merge commit 'cd3f1cee8b213c49e8e72347b316e30334db7b9d'

* commit 'cd3f1cee8b213c49e8e72347b316e30334db7b9d':
  AI 147986: Change CTS tests to use InstrumentationCoreTestRunner, which has handled the @BrokenTest
2009-04-30 00:01:22 -07:00
Scott Su
cd3f1cee8b am 0f009ff: AI 147986: Change CTS tests to use InstrumentationCoreTestRu
Merge commit '0f009ffc55bf3404f43dba000031d2293a14e061' into donut

* commit '0f009ffc55bf3404f43dba000031d2293a14e061':
  AI 147986: Change CTS tests to use InstrumentationCoreTestRunner, which has handled the @BrokenTest
2009-04-29 23:30:41 -07:00
Scott Su
0f009ffc55 AI 147986: Change CTS tests to use InstrumentationCoreTestRunner, which has handled the @BrokenTest
Automated import of CL 147986
2009-04-29 03:12:14 -07:00
Jean-Baptiste Queru
bc565c0a52 Merge donut into master 2009-04-22 18:33:17 -07:00
Jean-Baptiste Queru
930a035e01 Merge donut into master 2009-04-22 18:33:12 -07:00
Jean-Baptiste Queru
5c1ac9dc2b merge cupcake into donut 2009-04-22 17:56:58 -07:00
Jean-Baptiste Queru
6774d07747 merge cupcake into donut 2009-04-22 17:56:50 -07:00
Jean-Baptiste Queru
66b7286230 Merge donut into master 2009-04-22 17:12:34 -07:00
Jean-Baptiste Queru
148c959e53 Merge donut into master 2009-04-22 17:12:11 -07:00
Phil Dubach
3da72df159 AI 147060: am: CL 147059 CTS: Fix LOCAL_MODULE_TAGS for CTS tests
CTS tests should use local module tag 'tests' such that they are not built
  and included in the image by default.
  Original author: phillipd
  Merged from: //branches/cupcake/...

Automated import of CL 147060
2009-04-21 01:02:54 -07:00
Phil Dubach
16c35ed41b Merge branch 'readonly-p4-master' 2009-04-20 18:01:38 -07:00
Phil Dubach
2774b0fab0 AI 147064: am: CL 147060 am: CL 147059 CTS: Fix LOCAL_MODULE_TAGS for CTS tests
CTS tests should use local module tag 'tests' such that they are not built
  and included in the image by default.
  Original author: phillipd
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147064
2009-04-20 18:00:20 -07:00
Phil Dubach
3165096c2d AI 147059: CTS: Fix LOCAL_MODULE_TAGS for CTS tests
CTS tests should use local module tag 'tests' such that they are not built
  and included in the image by default.
  BUG=1778334

Automated import of CL 147059
2009-04-20 17:57:22 -07:00
Scott Su
0cdcd3c0ac Merge branch 'readonly-p4-master' 2009-04-18 20:49:11 -07:00
Scott Su
0a30b3a77e AI 146564: am: CL 146288 am: CL 146287 CTS: fixed failed problem in ProxyTest
Original author: sus
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146564
2009-04-18 20:48:00 -07:00
Scott Su
6bdcc6dd74 Merge branch 'readonly-p4-master' 2009-04-16 12:02:18 -07:00
Scott Su
daff20c5e6 AI 146516: am: CL 146072 am: CL 146071 CTS: Clean up test annotations
Original author: sus
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146516
2009-04-16 12:01:02 -07:00
Scott Su
9c2e78b128 AI 146288: am: CL 146287 CTS: fixed failed problem in ProxyTest
Original author: sus
  Merged from: //branches/cupcake/...

Automated import of CL 146288
2009-04-14 23:34:43 -07:00
Scott Su
71f2c4fa15 AI 146287: CTS: fixed failed problem in ProxyTest
Automated import of CL 146287
2009-04-14 23:34:23 -07:00
Eric Shienbrood
3c8d9bdcca Merge branch 'readonly-p4-master' 2009-04-14 15:41:31 -07:00
Eric Shienbrood
418d2d13d3 AI 146222: Manual merge of 145980 from donutburger => master.
Automated import of CL 146222
2009-04-14 15:40:20 -07:00
Eric Shienbrood
f4c5ba4856 AI 146222: Manual merge of 145980 from donutburger => master.
Automated import of CL 146222
2009-04-14 15:40:19 -07:00
Scott Su
2dc2221bbe Merge branch 'readonly-p4-master' 2009-04-14 12:24:45 -07:00
Scott Su
1c66a53d24 AI 146171: am: CL 145956 am: CL 145675 CTS: fixed the fail bug in android.net.cts.NetworkInfoTest
Original author: sus
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146171
2009-04-14 12:23:31 -07:00
Scott Su
e1065cdcdc Merge branch 'readonly-p4-master' 2009-04-14 12:16:32 -07:00
Scott Su
871df54aba AI 146168: am: CL 145953 am: CL 145668 CTS: add test cases for net.UrlQuerySanitizer.
Original author: sus
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146168
2009-04-14 12:15:18 -07:00
Scott Su
3ae3101a2a AI 146072: am: CL 146071 CTS: Clean up test annotations
Original author: sus
  Merged from: //branches/cupcake/...

Automated import of CL 146072
2009-04-13 23:24:06 -07:00
Scott Su
316ee5f68b AI 146071: CTS: Clean up test annotations
BUG=1654276

Automated import of CL 146071
2009-04-13 23:23:32 -07:00
Eric Shienbrood
77467ef35d AI 145980: am: CL 145881 Adding on to CL 145383, unhiding some additional methods and constants
that ought to be exposed. Hid and deprecated the single-arg public
  constructor for NetworkInfo, and modified a CTS test that was testing it.
  Ran the android.net test package to make sure it still works.
  Original author: ers
  Merged from: //branches/cupcake/...

Automated import of CL 145980
2009-04-13 18:12:47 -07:00
Eric Shienbrood
537a83c57a AI 145980: am: CL 145881 Adding on to CL 145383, unhiding some additional methods and constants
that ought to be exposed. Hid and deprecated the single-arg public
  constructor for NetworkInfo, and modified a CTS test that was testing it.
  Ran the android.net test package to make sure it still works.
  Original author: ers
  Merged from: //branches/cupcake/...

Automated import of CL 145980
2009-04-13 18:12:46 -07:00
Scott Su
a21e2abc53 AI 145956: am: CL 145675 CTS: fixed the fail bug in android.net.cts.NetworkInfoTest
Original author: sus
  Merged from: //branches/cupcake/...

Automated import of CL 145956
2009-04-13 15:47:21 -07:00
Scott Su
82bd6d83a2 AI 145953: am: CL 145668 CTS: add test cases for net.UrlQuerySanitizer.
Original author: sus
  Merged from: //branches/cupcake/...

Automated import of CL 145953
2009-04-13 15:37:58 -07:00
Eric Shienbrood
a445d544ce AI 145881: Adding on to CL 145383, unhiding some additional methods and constants
that ought to be exposed. Hid and deprecated the single-arg public
  constructor for NetworkInfo, and modified a CTS test that was testing it.
  Ran the android.net test package to make sure it still works.
  BUG=1779439

Automated import of CL 145881
2009-04-13 10:41:56 -07:00
Eric Shienbrood
d33eb60d31 AI 145881: Adding on to CL 145383, unhiding some additional methods and constants
that ought to be exposed. Hid and deprecated the single-arg public
  constructor for NetworkInfo, and modified a CTS test that was testing it.
  Ran the android.net test package to make sure it still works.
  BUG=1779439

Automated import of CL 145881
2009-04-13 10:41:53 -07:00
Scott Su
bcc4ca1dfb AI 145675: CTS: fixed the fail bug in android.net.cts.NetworkInfoTest
Automated import of CL 145675
2009-04-09 22:36:44 -07:00
Scott Su
c9ef937af0 AI 145668: CTS: add test cases for net.UrlQuerySanitizer.
Automated import of CL 145668
2009-04-09 22:21:00 -07:00