* changes:
Integrate unsubmitted cupcake change 131139: CTS: add test cases for net.wifi.ScanResult, SupplicantState, WifiConfiguration, WifiInfo and WifiManager. Added new tests as per mondrian comments. Cleaned code to get rid of eclipse warnings.
CTS: add test cases for net.wifi.ScanResult, SupplicantState, WifiConfiguration, WifiInfo and WifiManager.
Added new tests as per mondrian comments. Cleaned code to get rid of eclipse warnings.
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
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.
BUG=1779439
Automated import of CL 145881
update wrong TestLevel values
update tests that were still using the old annotations
minor fixes to eliminate eclipse warnings
style fixes
Original author: sus
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143326
update wrong TestLevel values
update tests that were still using the old annotations
minor fixes to eliminate eclipse warnings
style fixes
Original author: sus
Merged from: //branches/cupcake/...
Automated import of CL 143176