Merge commit 'aedc07c0ed19dca06e48446921bdd231b7bc99f6'
* commit 'aedc07c0ed19dca06e48446921bdd231b7bc99f6':
AI 148455: CTS: Change tests in Android plan to use new InstrumentationCtsTestRunner
Merge commit 'e480582d829a87e2d7097cb79b7afb9e4ccbf74a' into donut
* commit 'e480582d829a87e2d7097cb79b7afb9e4ccbf74a':
AI 148455: CTS: Change tests in Android plan to use new InstrumentationCtsTestRunner
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.
Merge commit 'cd3f1cee8b213c49e8e72347b316e30334db7b9d'
* commit 'cd3f1cee8b213c49e8e72347b316e30334db7b9d':
AI 147986: Change CTS tests to use InstrumentationCoreTestRunner, which has handled the @BrokenTest
Merge commit '0f009ffc55bf3404f43dba000031d2293a14e061' into donut
* commit '0f009ffc55bf3404f43dba000031d2293a14e061':
AI 147986: Change CTS tests to use InstrumentationCoreTestRunner, which has handled the @BrokenTest
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
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
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
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
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
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
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