Commit Graph

939 Commits

Author SHA1 Message Date
nharold
f4e0b5bb52 Merge "IpSec - API Tweak for removeTransportModeTransforms" am: 1ca0e05919 am: c1f0cbb244
am: dc42b714fb

Change-Id: I30c1aec77926a8c6f5867a3364dc0b3b0ec38d49
2018-01-17 20:45:59 +00:00
nharold
1ca0e05919 Merge "IpSec - API Tweak for removeTransportModeTransforms" 2018-01-17 19:07:10 +00:00
nharold
fb34735033 Merge "Update testCreateTransform() for one-way transforms" am: 44eef0ee8d am: 9715ccb8b1
am: 1d9eb58067

Change-Id: If2acd0fb9ff565eecf33544309e7b465f662bd62
2018-01-17 10:16:39 +00:00
nharold
ebbeaa53f1 Merge "Update IpSecManagerTest for API changes to Transforms" am: 5810dda443 am: ed61c2a2a2
am: 4267616561

Change-Id: Ie4b65d1ba4578209776a8f9270e17ffba323d4a4
2018-01-17 10:00:06 +00:00
Nathan Harold
9c590594b6 IpSec - API Tweak for removeTransportModeTransforms
Update IpSec tests to remove the transform parameter from
calls to removeTransportModeTransform(). It is infeasible
and thus removed.

Bug: 72079356
Test: cts - IpSecManagerTest
Change-Id: Iaa0b35b24bf044503da9af9966508ac5e88846e1
2018-01-17 01:07:52 -08:00
nharold
44eef0ee8d Merge "Update testCreateTransform() for one-way transforms" 2018-01-17 08:45:29 +00:00
nharold
5810dda443 Merge "Update IpSecManagerTest for API changes to Transforms" 2018-01-17 08:40:37 +00:00
Nathan Harold
f91b5a214b Update testCreateTransform() for one-way transforms
This patch augments testCreateTransform() to
selectively apply the ipSecTransform in one/both
directions and then verifies that the link succeeds or
fails correctly. In addition, this converts the test
to use the Java sockets API for DatagramSocket instead
of using the FD-based API. One of the combos does not
fail as expected, so b/72048263 is tracking further
work needed.

Bug: 72047396
Bug: 71717213
Test: cts - IpSecManagerTest

Change-Id: Ied961f442b29f1e66ded37c7ffe7afdd4a5c49da
2018-01-16 21:12:43 -08:00
Nathan Harold
19adaa182d Update IpSecManagerTest for API changes to Transforms
API changes in IpSecManager and IpSecTransform are
reflected in these test updates: no functional change
to the test; just style updates along with improvement
in the clarity of using a single transform for both
directions.

Bug: 71717213
Test: CTS - IpSecManagerTest
Change-Id: Ia6933d010620516672687080898f8c4fd83223bc
2018-01-16 11:15:13 -08:00
Android Build Merger (Role)
f64429d19b Merge "Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071 am: 5a35f88cbb am: 8324e947c3 am: cf9ee25695" into oc-mr1-dev-plus-aosp
am: 2dbf42fa50

Change-Id: I60651eb0c610362ad48a02c93db2e07b01908ecd
2018-01-12 00:51:30 +00:00
Alex Vakulenko
532d9e9f29 Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071 am: 5a35f88cbb am: 8324e947c3
am: cf9ee25695

Change-Id: I471d0a7d7c616fdfe792d05ad63762da941dbb36
2018-01-12 00:28:38 +00:00
Alex Vakulenko
cf9ee25695 Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071 am: 5a35f88cbb
am: 8324e947c3

Change-Id: Ie74187a985dcfa543e1ccd489cf5019d1a46db9e
2018-01-12 00:23:34 +00:00
TreeHugger Robot
41bdd1d7b5 Merge "Update PROCESS_STATE_FOREGROUND_SERVICE constant value." 2018-01-12 00:20:12 +00:00
Alex Vakulenko
8324e947c3 Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071
am: 5a35f88cbb

Change-Id: Id3ca47b04227c1a5425eb156095a387f4cced06a
2018-01-12 00:17:04 +00:00
Alex Vakulenko
5a35f88cbb Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev
am: 9992c29071

Change-Id: I7aa6862055d7252b1c801b5deee4b81d7b707c4b
2018-01-12 00:12:38 +00:00
Android Merger
eeef276826 Merge "Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071" into oreo-mr1-cts-dev
am: 803a8520c2

Change-Id: I2feea16764dc7844a083e16df3e401b5158c11df
2018-01-12 00:12:10 +00:00
Alex Vakulenko
daf2e786d2 Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev
am: 9992c29071

Change-Id: I5ea0bd658d11252b1c32cab7bedd1bfac8e80b26
2018-01-12 00:07:41 +00:00
Treehugger Robot
9992c29071 Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev 2018-01-12 00:01:30 +00:00
Chenbo Feng
0f27294a76 Merge "Check kernel version before running qtaguid test" am: 3b38b58b1f am: 6563bb9f75
am: 9e998c4312

Change-Id: I448478ec089c6fd9676ca3b034d8bc8c5ddad23b
2018-01-11 21:43:27 +00:00
Treehugger Robot
3b38b58b1f Merge "Check kernel version before running qtaguid test" 2018-01-11 21:18:47 +00:00
Sudheer Shanka
f54b3dd76a Update PROCESS_STATE_FOREGROUND_SERVICE constant value.
Bug: 71758358
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests

Change-Id: Ia4509e94e33db5b61bf1aea704d25a199d381494
2018-01-11 12:44:58 -08:00
Chenbo Feng
3a9e2dc232 Check kernel version before running qtaguid test
The qtaguid module is required for devices running kernel earlier then
4.9, but is no longer avaliable after that. Add a check before running
the kernel qtaguid native test so it doesn't fail on new devices.

Bug: 30950746
Test: run cts -m CtsNativeNetTestCases
Change-Id: I32bc77a4c51d8b64ac1a5411c75c56a51b84ea77
2018-01-11 11:15:06 -08:00
Alex Vakulenko
9a35c697dc Add a delay before toggling WiFi to let listening activity to start up
testConnectivityChanged_manifestRequestOnlyPreN_shouldReceiveIntent()
starts up a helper activity that listens to network connection/disconnection
notification. In many cases the test fails because the activity is just
able to start up and initialize itself before the first toggle event
arrives and in many cases it just misses by a matter of 100ms.

Added a short sleep after we start the activity and before we start
toggling WiFi to let the activity a chance to receive the first
notification.

Bug: 70988664
Change-Id: Ie122770fc8447a936d079fae7bdce61b10cf6dc2
2018-01-10 17:27:32 -08:00
Adam Vartanian
a02bbf31c4 DO NOT MERGE Add CTS test for URI fix.
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c)
2018-01-08 13:33:23 -08:00
Sudheer Shanka
a353a9bf2b Merge "Skip unsupported tests on low ram devices." into stage-aosp-oc-mr1-cts-dev
am: e352866bee

Change-Id: I62d301dd0c4f026ea4f52de0ad706d50ff5382e4
2018-01-06 01:42:28 +00:00
Adam Vartanian
5dc6849013 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285 am: f259a8e37a am: 3d7e43b226 am: 2516305c8c
am: cd4ab882f0

Change-Id: I2f49f443143274a2deeccbdd7aa85d9484997c44
2018-01-05 20:43:59 +00:00
Manoj Boopathi Raj
6e2018b7eb Merge "Added CTS to test dual stack socket for TCP & UDP" am: f4f12703bf am: 397ebd2edb
am: d0b69020dd

Change-Id: I11884ed92fbec0119ecb70289409d8e0f5d1493b
2018-01-04 18:59:03 +00:00
Manoj Boopathi Raj
d0b69020dd Merge "Added CTS to test dual stack socket for TCP & UDP" am: f4f12703bf
am: 397ebd2edb

Change-Id: I401e26896dfb47f8c95d27a029fe4893e8d88b70
2018-01-04 18:53:11 +00:00
Sudheer Shanka
2afa7e6e4b Merge "Skip unsupported tests on low ram devices." into stage-aosp-oc-mr1-cts-dev am: e352866bee am: dfc9fb0901
am: 87c8dbbc39

Change-Id: Ie190f774998de77843b8af9ef25bbfef615c66bb
2018-01-03 20:42:05 +00:00
Sudheer Shanka
87c8dbbc39 Merge "Skip unsupported tests on low ram devices." into stage-aosp-oc-mr1-cts-dev am: e352866bee
am: dfc9fb0901

Change-Id: I81f9100fa7e10c1a18225733a6ce5c3645876a46
2018-01-03 20:32:37 +00:00
manojboopathi
f1c7d18cf2 Added CTS to test dual stack socket for TCP & UDP
This ensures the function IpSecManager.applyTransportModeTransform()
works as expected when used with Java sockets.

Bug: 70160694
Test: Ran CTS test (./run_cts.sh)
Change-Id: Ia4b636c0f48a0eeffb8813d271e59aeb86bd44bc
2018-01-02 13:54:04 -08:00
Benedict Wong
92e883e060 Merge "Fix IpSecManager CTS tests on 4.4 kernels" am: 7dd13c1315 am: 19e33b5078
am: 8080294716

Change-Id: I65d3b216f2ce516d85cd7920763a3caa0ee6cde5
2017-12-22 05:03:30 +00:00
Benedict Wong
8080294716 Merge "Fix IpSecManager CTS tests on 4.4 kernels" am: 7dd13c1315
am: 19e33b5078

Change-Id: I26fac4d14dc6b88ecb9bdbfce88d9f72500ee180
2017-12-22 04:58:01 +00:00
Benedict Wong
b04f7cea99 Fix IpSecManager CTS tests on 4.4 kernels
Investigation shows that 4.4 kernels take longer for loopback TCP
packets to be ack'd, and results in extra ack packets to be generated in
cases where both the server and client sockets send data packets at the
same time. This was verified via TCPdump, where an extra ack packet was
generated per run of the bidirectional transmissions in checkTcp().

This change verifies that the data + ack packets have been sent and
counted before initiating the reverse transmission. Further, changes
have been made to improve the reliability of this code via counting
expected packets (rather than sleeps).

Bug: 62994731
Test: CTS tests run (and passing) on walleye, marlin and angler
Change-Id: I7c707ec3b11235a5a9cba10275aee40e2eb37169
2017-12-21 15:02:04 -08:00
Sudheer Shanka
b7a503b578 Skip unsupported tests on low ram devices.
Notification listeners are not allowed on low ram devices.
Skip testDozeModeMetered_enabledButWhitelistedOnNotificationAction
and testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction
on low ram devices since these tests depend on being able to
register notification listeners.

Bug: 70242457
Bug: 70545780
Test: testDozeModeMetered_enabledButWhitelistedOnNotificationAction
and testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction
Change-Id: I8ce6f330760042ca790cd6fb10e62ebe86498a06
2017-12-21 11:23:21 -08:00
Benedict Wong
38888ca19e Merge "[ipsec-qtaguid] Update tests to check data usage" am: eca595be58 am: 50609feb1c
am: 2b43c590b6

Change-Id: I55c7a32bbdcdf582c73edf98805e7d2440dd8e04
2017-12-19 00:37:32 +00:00
Benedict Wong
2b43c590b6 Merge "[ipsec-qtaguid] Update tests to check data usage" am: eca595be58
am: 50609feb1c

Change-Id: I1d465ac9e1200dec6679879f92e1582e5fe53652
2017-12-19 00:24:41 +00:00
Benedict Wong
0bff9ab1c4 [ipsec-qtaguid] Update tests to check data usage
This change ensures that all forms of transport-mode packets are
correctly accounted for, and not double-counted. This includes both
per-UID counters, as well as interface counters.

Bug: 62994731
Test: CTS tests updated, passing
Change-Id: I83be0724ac21d9db7d91ce72733d13fb6736e66e
2017-12-18 19:46:30 +00:00
TreeHugger Robot
de2ef3bd4f Merge "Add cts suite tag to all CTS modules" 2017-12-16 14:11:49 +00:00
jdesprez
607948bfb0 Add cts suite tag to all CTS modules
Test: build
Bug: 65303193
Change-Id: I064459de5d4f8e958f41ac238cad35e5f7e99d3a
2017-12-16 04:19:31 -08:00
Paul Duffin
f183f746dd Add android.test.base/stubs dependency
In preparation for the removal of the non-junit classes in the
android.test.base library from the android.jar this adds a dependency
on android.test.base/stubs to ensure this code will continue to
compile.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* apps/CtsVerifier/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsVerifier's will need them in order to compile once its classes
    are removed from the test_current SDK on which it currently
    depends.

* common/device-side/util/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    compatibility-device-util's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAppAccessData's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/AppWithData/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAppWithData's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDocumentClient's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsEncryptionApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsExternalStorageApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsInstrumentationAppDiffCert's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsMultiUserStorageApp's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPrivilegedUpdateTests's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsReadExternalStorageApp's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitApp's will need them in order to compile once its classes
    are removed from the current SDK on which it currently depends.

    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitAppDiffRevision's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitAppDiffVersion's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitAppDiffCert's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsStorageAppA's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsStorageAppB's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsStorageStatsApp's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUsePermissionDiffCert's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUsesLibraryApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWriteExternalStorageApp's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsKeySetTestApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccountCheckAuthApp's will need them in order to compile once
    its classes are removed from the test_current SDK on which it
    currently depends.

* hostsidetests/devicepolicy/app/AccountManagement/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccountManagementDevicePolicyApp's will need them in order to
    compile once its classes are removed from the current SDK on which
    it currently depends.

* hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsCorpOwnedManagedProfile's will need them in order to compile
    once its classes are removed from the test_current SDK on which it
    currently depends.

    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsCorpOwnedManagedProfile2's will need them in order to compile
    once its classes are removed from the test_current SDK on which it
    currently depends.

* hostsidetests/devicepolicy/app/CustomizationApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsCustomizationApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DelegateApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDelegateApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminApp23's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminApp24's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminService1's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminService2's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminService3's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminService4's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminServiceB's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAndProfileOwnerApp23's will need them in order to compile
    once its classes are removed from the test_current SDK on which it
    currently depends.

* hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAndProfileOwnerApp25's will need them in order to compile
    once its classes are removed from the test_current SDK on which it
    currently depends.

* hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAndProfileOwnerApp's will need them in order to compile
    once its classes are removed from the test_current SDK on which it
    currently depends.

* hostsidetests/devicepolicy/app/DeviceOwner/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceOwnerApp's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/IntentReceiver/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsIntentReceiverApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/IntentSender/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsIntentSenderApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/LauncherTests/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsLauncherAppsTests's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/ManagedProfile/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsManagedProfileApp's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/PackageInstaller/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPackageInstallerApp's will need them in order to compile once
    its classes are removed from the test_current SDK on which it
    currently depends.

* hostsidetests/devicepolicy/app/ProfileOwner/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsProfileOwnerApp's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* hostsidetests/incident/apps/boundwidgetapp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAppWidgetApp's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* hostsidetests/net/app/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsHostsideNetworkTestsApp's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/numberblocking/app/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsHostsideNumberBlockingAppTest's will need them in order to
    compile once its classes are removed from the current SDK on which
    it currently depends.

* hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher1's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher2's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher3's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher4new's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher4old's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher1's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher2's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher3's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4new's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4new_nobackup's will need them in order
    to compile once its classes are removed from the current SDK on
    which it currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4new_nomanifest's will need them in order
    to compile once its classes are removed from the current SDK on
    which it currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4new_wrongkey's will need them in order
    to compile once its classes are removed from the current SDK on
    which it currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4old's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4old_nomanifest's will need them in order
    to compile once its classes are removed from the current SDK on
    which it currently depends.

* hostsidetests/shortcuts/deviceside/multiuser/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutMultiuserTest's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/shortcuts/deviceside/upgrade/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutUpgradeVersion1's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutUpgradeVersion2's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/ui/control/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceTaskSwitchingControl's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/usb/SerialTestApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUsbSerialTestApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/webkit/app/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWebViewStartupApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/ProcessTest/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    ProcessTests's will need them in order to compile once its classes
    are removed from the current SDK on which it currently depends.

* tests/acceleration/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccelerationTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/accessibility/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccessibilityTestCases's will need them in order to compile once
    its classes are removed from the test_current SDK on which it
    currently depends.

* tests/accessibilityservice/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccessibilityServiceTestCases's will need them in order to
    compile once its classes are removed from the test_current SDK on
    which it currently depends.

* tests/admin/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAdminTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/app/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAppTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/backup/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsBackupTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/camera/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsCameraTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/fragment/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsFragmentTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/sample/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSampleDeviceTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/sensor/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    cts-sensors-tests's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/accounts/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccountManagerTestCases's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* tests/tests/alarmclock/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAlarmClockTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/assist/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAssistTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/bluetooth/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsBluetoothTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/calendarcommon/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsCalendarcommon2TestCases's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* tests/tests/car/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsCarTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/contactsproviderwipe/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsContactsProviderWipe's will need them in order to compile once
    its classes are removed from the test_current SDK on which it
    currently depends.

* tests/tests/database/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDatabaseTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/tests/display/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDisplayTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/dpi/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDpiTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/dpi2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDpiTestCases2's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/drm/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDrmTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/externalservice/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsExternalServiceTestCases's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* tests/tests/graphics/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsGraphicsTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/tests/location/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    cts-location-tests's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsLocationTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/tests/mediastress/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsMediaStressTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/midi/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsMidiTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/multiuser/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsMultiUserTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/tests/nativehardware/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    cts-nativehardware-tests's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsNetSecPolicyUsesCleartextTrafficFalseTestCases's will need them
    in order to compile once its classes are removed from the current
    SDK on which it currently depends.

* tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsNetSecPolicyUsesCleartextTrafficTrueTestCases's will need them
    in order to compile once its classes are removed from the current
    SDK on which it currently depends.

* tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases's will need
    them in order to compile once its classes are removed from the
    current SDK on which it currently depends.

* tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsNetSecConfigDownloadManagerTestCases's will need them in order
    to compile once its classes are removed from the current SDK on
    which it currently depends.

* tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsNetSecConfigResourcesSrcTestCases's will need them in order to
    compile once its classes are removed from the current SDK on which
    it currently depends.

* tests/tests/opengl/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsOpenGLTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/openglperf/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsOpenGlPerfTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/packageinstaller/adminpackageinstaller/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAdminPackageInstallerTestCases's will need them in order to
    compile once its classes are removed from the test_current SDK on
    which it currently depends.

* tests/tests/permission2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPermission2TestCases's will need them in order to compile once
    its classes are removed from the test_current SDK on which it
    currently depends.

* tests/tests/preference/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPreferenceTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/preference2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPreference2TestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/renderscript/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsRenderscriptTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/rsblas/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsRsBlasTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/rscpp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsRsCppTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/sax/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSaxTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/selinux/selinuxTargetSdk/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSelinuxTargetSdkTestCases's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* tests/tests/selinux/selinuxTargetSdk2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSelinuxTargetSdk2TestCases's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* tests/tests/shortcutmanager/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutManagerTestCases's will need them in order to compile
    once its classes are removed from the test_current SDK on which it
    currently depends.

* tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSimpleperfDebugApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/telecom/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsTelecomTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/tests/telecom2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsTelecomTestCases2's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/telecom3/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsTelecomTestCases3's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/telephony/preconditions/app/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsTelephonyPreparerApp's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/text/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsTextTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/tests/theme/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsThemeDeviceTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/tv/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsTvTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/uiautomation/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUiAutomationTestCases's will need them in order to compile once
    its classes are removed from the test_current SDK on which it
    currently depends.

* tests/tests/uidisolation/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUidIsolationTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/voiceinteraction/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsVoiceInteractionTestCases's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* tests/tests/voicesettings/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsVoiceSettingsTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/wrap/nowrap/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapNoWrapTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/wrap/wrap_debug/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapWrapDebugTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/wrap/wrap_debug_malloc_debug/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapWrapDebugMallocDebugTestCases's will need them in order to
    compile once its classes are removed from the current SDK on which
    it currently depends.

* tests/tests/wrap/wrap_nodebug/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapWrapNoDebugTestCases's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* tests/tvprovider/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsTvProviderTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/ui/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUiDeviceTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/video/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsVideoTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/vr/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsVrTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tools/cts-device-info/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceInfo's will need them in order to compile once its classes
    are removed from the SDK on which it currently depends.

* tools/cts-holo-generation/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsHoloGeneration's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tools/cts-preconditions/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPreconditions's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tools/cts-reference-app-lib/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    android.cts.refapp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

Bug: 30188076
Test: make dist
Change-Id: I1d263c97b9009bad09cfea07f9c56fc0943ef203
2017-12-15 07:28:45 +00:00
David Benjamin
0a17196f3a Merge "Clear some random compile warnings." am: 8d7d4479a5 am: 2730c60fde
am: a92a6bb33e

Change-Id: I631b68d218982fd20e79c9be9378accfa5b1a6fc
2017-12-14 22:23:28 +00:00
David Benjamin
a92a6bb33e Merge "Clear some random compile warnings." am: 8d7d4479a5
am: 2730c60fde

Change-Id: If25634c6867446c79735a433a2238aebfde72b34
2017-12-14 22:16:00 +00:00
Treehugger Robot
8d7d4479a5 Merge "Clear some random compile warnings." 2017-12-14 21:51:21 +00:00
nharold
2d2cb4eda8 Merge "Update CTS to use renamed API method." am: 123988e6e1 am: 51fc96db37
am: b69ec1d499

Change-Id: Id09e95e39d85393c570840372ee38a89dc2447b9
2017-12-14 21:44:46 +00:00
nharold
b69ec1d499 Merge "Update CTS to use renamed API method." am: 123988e6e1
am: 51fc96db37

Change-Id: I4c64458a793b56b3daf11287d340ead4bd40948d
2017-12-14 21:32:52 +00:00
Jonathan Basseri
b58d3aa5b8 Update CTS to use renamed API method.
IPsec API is renaming reserveSecurityParameterIndex to
allocateSecurityParameterIndex. Update tests to reflect this.

Bug: 69128142
Test: TreeHugger should be enough
Change-Id: I0bfaa3584920096ffde7f9eeee9fccd0ec842821
2017-12-14 21:09:28 +00:00
David Benjamin
6208358a7c Clear some random compile warnings.
I saw a bunch fly by. Here are a few fixes.

ssize_t is %zd. Types from stdint.h use PRI* macros from inttypes.h.
Finally, use C99 initializers rather than the old GNU extension.

Test: make checkbuild
Change-Id: I343dfb99984ab826c7641e311e041e859eb61d93
2017-12-13 22:15:09 +00:00
Nathan Harold
cf96b1d048 Merge "Fix IpSecAlgorithm Lengths in IpSecManagerTest" am: ab2a300272 am: d79c57dde6
am: 9a607658e4

Change-Id: Iacbd5159f42a27cdafaf27cf0d3d6538912ba6ae
2017-12-13 04:03:19 +00:00
Nathan Harold
9a607658e4 Merge "Fix IpSecAlgorithm Lengths in IpSecManagerTest" am: ab2a300272
am: d79c57dde6

Change-Id: I6c09b8b271486530a10d6e4f2beec2aa6b9e9d0c
2017-12-13 03:57:02 +00:00