5036 Commits

Author SHA1 Message Date
Jeff Sharkey
b04a511ac4 Let tests enumerate all transports/capabilities.
This gives them a way to collect all included values without
resorting to manual probing of each newly added value.

Cherry-pick of ag/4052941 with minor conflicts in the imports.

Bug: 16207332
Test: atest com.android.cts.net.HostsideVpnTests
Change-Id: Ia764b3412bf834890612378e0c3846913f4e0a06
Merged-In: Ie5cd22cfa2b6a60510fd1e31d7ebcd8f6cc890a0
Merged-In: If07e77c92046807235229a4f67ee087bdd7bccf1
2018-06-06 08:25:36 +00:00
Hall Liu
378f1f4972 Add CallAudioState ctor as TestApi
Needed for CTS testing

Bug: 79528185
Test: CTS
Change-Id: Iad154257a93cc776d5800527e46e777fd6c88220
Merged-In: Iad154257a93cc776d5800527e46e777fd6c88220
2018-05-25 15:22:16 -07:00
fionaxu
780b62b3b5 A test api to override carrier information
This API should only be used for testing purpose e.g., CTS/GTS/SL4A
By overriding carrier information, we could force a particular carrier id,
carrier's config, but also any country or carrier overlays to be loaded
when using a test SIM with a call box.

Bug: 72332597
Test: atest CtsTelephonyTestCases:CarrierIdentificationTest

Change-Id: Icd5804375ef9334c9f6c382cc6a774b9c9c15213
(cherry picked from commit 5b509b81a0d5b14148745368b153dc6b8d4482ac)
Merged-in: 5b509b81a0d5b14148745368b153dc6b8d4482ac
2018-04-12 22:19:15 +00:00
Hall Liu
beb880f724 Make setServiceId a TestApi
Bug: 77152869
Test: CTS
Change-Id: I26f60b48865953971de02c50db48e0ff66f4e2a0
Merged-In: I26f60b48865953971de02c50db48e0ff66f4e2a0
2018-04-11 18:23:30 -07:00
Treehugger Robot
aa8f09d41a Merge "Split the DownloadStateCallback class into two" 2018-03-26 23:53:40 +00:00
Hall Liu
49d1cb4770 Split the DownloadStateCallback class into two
Use individually-registered DownloadStatusListener and
DownloadProgressListener instead to listen for download status and
progress, respectively.

Bug: 74409377
Test: cts
Change-Id: Ifd5289038ffd66eef8bd7916f5256205b49be5f9
Merged-In: Ifd5289038ffd66eef8bd7916f5256205b49be5f9
2018-03-26 21:45:21 +00:00
Jack Yu
46d2bc06d6 Renamed getNetworkId and getSystemId
1. Renamed getNetworkId() to getCdmaNetworkId()
2. Renamed getSystemId() to getCdmaSystemId()

Test: Build
Bug: 74976831
Merged-In: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
Change-Id: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
(cherry picked from commit 2661fac133db49124d2377f49506b12c1a6c9505)
2018-03-16 11:07:37 -07:00
Jack Yu
260f2fa1fe Added CTS test cases for getNetworkId() and getSystemId()
Bug: 32718590
Test: atest CtsTelephonyTestCases:ServiceStateTest#testServiceState
Merged-In: I5826a59d85028f0350ee39c69553f4e488d6456b
Change-Id: I5826a59d85028f0350ee39c69553f4e488d6456b
(cherry picked from commit 1b8b38928b4e20e7e66ab75e39159b158dc5c4c9)
2018-03-16 00:26:33 -07:00
Hall Liu
13ee5767e1 Un-hide Connection-side RTT APIs for Dialer
Bug: 63934808
Test: builds
Change-Id: I59a892fb0e314810e92dd9ad7d0c2f4610055045
Merged-In: I59a892fb0e314810e92dd9ad7d0c2f461005504
2018-02-15 21:34:55 +00:00
Adam Lesinski
5691a7ca14 Remove redundant final modifiers from api
This change is the result of running

  make update-api

with the related doclava change in this topic.

Test: manual
Merged-In: I193781c281fbde13ccdaedeaee30f8d7c3b5f33e
Change-Id: I174874dc0af9deda6d88dced5871aa8add05d5fa
2018-02-06 14:49:34 -08:00
Hall Liu
92964f60ec Rename MbmsDownloadSession#getDownloadStatus
Rename and change signature/behavior to match up with middleware
vendor's expectations

Test: run CTS tests
Change-Id: If18acff5631cfc0473c342e9250973866e960d69
2018-02-01 13:23:17 -08:00
Benedict Wong
babe5d7364 [ipsec-qtaguid] Tag sockets upon creation of encap sockets
Added calls to tag encap sockets to that of the UID for which the encap
socket is being created on behalf of. This ensures that all data
accounting generated for the UDP-encap-ESP socket is correctly billed to
the right UID.

Bug: 62994731
Test: New tests added to IpSecServiceTest.java, passing
Change-Id: I15365ea9c982fd7b4e3cdeff314ddfba2289c86e
2017-12-18 19:46:06 +00:00
Jeff Sharkey
bc4f48b21d Emit all APIs using Predicates.
Generate APIs using updated doclava.

Test: manual inspection of API text files
Bug: 69505783
Change-Id: I2efd22998a64ebb57588b073c4a591242f4aef91
Merged-In: I2efd22998a64ebb57588b073c4a591242f4aef91
2017-12-06 21:56:12 -07:00
Sanket Padawe
c376ca6bc1 Merge "API declarations for Call Handover."
am: d88abc7b60

Change-Id: I0be6f240073408bf9520766238ecf791c016a40b
2017-11-16 01:45:25 +00:00
Sanket Padawe
a8eddd48c4 API declarations for Call Handover.
Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#

Bug: 65415068
Test: manual.
Change-Id: I0c2f561d92ad6504f858eadde09980fc1ce8727f
2017-11-15 13:41:05 -08:00
Xin Li
220871a697 Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
2017-11-14 12:31:11 -08:00
Hall Liu
f6b2b77e40 Merge changes from topics "embms-cts-6", "embms-cts-5"
* changes:
  Add @TestApi for MbmsDownloadReceiver CTS
  Add @TestApi for DownloadStateCallback CTS
2017-11-10 20:46:19 +00:00
Hall Liu
025718e8f6 Merge "Update Telecom APIs to include multi-hfp" 2017-11-10 19:49:01 +00:00
Hall Liu
a98f58b5c1 Update Telecom APIs to include multi-hfp
* Add bluetooth devices to CallAudioState
* Add methods for specifying a bluetooth device to InCallService
* Add methods for specifying a bluetooth device to Connection (for
self-managed connections)

Bug: 64767509
Test: unit tests
Change-Id: I286b19b423dc2ee417dbc90eda7e8055b2da2444
2017-11-09 15:54:50 -08:00
Tobias Thierer
e8b07e5bef Merge "Track deprecation/replacement of Os methods that depend on Mutable*" 2017-11-08 16:34:03 +00:00
Jordan Liu
1f8ee4ff25 Merge "Add a carrier config indicating whether user can edit a voicemail number" 2017-11-07 18:28:33 +00:00
Tobias Thierer
99a1d450da Track deprecation/replacement of Os methods that depend on Mutable*
Another CL in this CL topic is deprecating/removing three methods
in android.system.Os, and introducing replacements.

This CL tracks that change by updating frameworks/base accordingly.

Test: Treehugger
Bug: 67901714

Change-Id: I96ad205a305801b2cb641ba8984810dfe6474032
2017-11-07 02:51:27 +00:00
Treehugger Robot
faffb072a4 Merge "Allow to attach jvmti agents from inside of process" 2017-11-06 20:34:34 +00:00
Philip P. Moltmann
fd8ed85adb Allow to attach jvmti agents from inside of process
Test: cts-tradefed run singleCommand cts-dev -m CtsJvmtiAttachingTestCases
Bug: 65016018
Change-Id: I6d445afa288c6fec1d860150159fa05ed63cf517
2017-11-03 10:33:21 -07:00
Jeff Sharkey
72f9c42b9e Define NOT_ROAMING network capability.
The "roaming" state of a network really belongs on NetworkCapabilities
instead of being published through NetworkInfo.isRoaming().  One major
reason is to support developers creating NetworkRequests for a
non-roaming network.

Watch for any capability changes that network statistics are
interested in (either metered or roaming) and notify it to perform
an update pass; fixes bug where we previously only triggered on
roaming changes.

Fix bug in VPNs where metered/roaming capabilities of underlying
networks weren't being propagated; this was probably preventing
some jobs from running over unmetered networks, and causing other
jobs to run over roaming networks!  Also passes along link bandwidth
information from underlying networks, and propegates any changes
to underlying networks.

Fix race condition by reading prevNc inside lock.  Utility methods
correctly calculate min/max link bandwidth values.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity.,com.android.server.ConnectivityServiceTest
Bug: 68397798, 16207332
Change-Id: I3e1a6544c902bf3a79356b72d3616af1fd2b0f49
2017-11-01 19:05:42 -06:00
Hall Liu
f1167ced38 Merge "Add @TestApi for EMBMS APIs needed for CTS" 2017-11-01 22:35:51 +00:00
manabu, shimoda
d245ba438c Add a carrier config indicating whether user can edit a voicemail number
Some carriers require to make it possible to prevent user editing
voicemail number. This carrier config is used to disable voicemail
number setting in Settings.

Test: manual - Checked that the voice mail number editing could be
controlled by carrier config.
Bug: 67872671
Merged-In: Ibbc3e0aa9d3d15abbb44477acd6d3546593a21bf
Change-Id: Ibbc3e0aa9d3d15abbb44477acd6d3546593a21bf
2017-11-01 11:47:34 -07:00
Tobias Thierer
ae71c4f23c make update-api
This CL almost exactly reverts http://r.android.com/471377 .

current.txt and friends were not reflecting the latest AOSP API,
ie. "make update-api" was not a no-op like it's supposed to be.

Apart from IpSecManager.SecurityParameterIndex.finalize(), this
seems to mostly revert http://r.android.com/471377 which suggests
that the tooling change that necessitated that CL was probably
reverted without "make update-api" being run on AOSP.

No further investigation was made for what CL(s) caused this or
whether any of this API change is undesired.

Test: Treehugger
Test: make update-api

Change-Id: I5b846627e38c47abb534def97f0cab9d28b1288c
2017-11-01 17:21:59 +00:00
Hall Liu
3ce024a4b2 Add @TestApi for MbmsDownloadReceiver CTS
Also fix a few bugs that were discovered in the download receiver code
as part of testing.

Bug: 68049452
Test: CTS
Change-Id: Ie5ca77af1fc43e4912bd74957d8ca95d347d229c
2017-10-31 18:58:38 -07:00
Hall Liu
63c5fd60ac Add @TestApi for DownloadStateCallback CTS
Bug: 68049452
Test: CTS
Change-Id: I6bcb1abb1adfe100dee4c381717bcc412578f58b
2017-10-31 18:50:44 -07:00
Hall Liu
156b3041a9 Add @TestApi for EMBMS APIs needed for CTS
Bug: 68049452
Test: CTS
Change-Id: I5d132ac4e67deccf41c998822f82cf94d3f2ce7f
2017-10-31 18:49:09 -07:00
Hall Liu
1fab41e771 Merge "EMBMS - Add TestApi and provide service override" 2017-10-27 23:19:29 +00:00
Cassie Han
1565803cd2 Merge "Add the operator name and MCC/MNC in string format into the CellIdentity." 2017-10-27 17:17:54 +00:00
Hall Liu
64e22af32e EMBMS - Add TestApi and provide service override
Add @TestApi annotations to methods that CTS needs
Add a manifest meta-data key that allows client apps to specify the
exact component name of the MBMS service to bind to.

Bug: 68049452
Test: CTS
Change-Id: I50654c41da38696a25fad93d0a5e0b0c11fa0b42
2017-10-26 15:46:42 -07:00
Cassie
933b78d977 Add the operator name and MCC/MNC in string format into the CellIdentity.
Bug: 63984327
Test: Basic telephony sanity
Change-Id: Ia5e7f5b980efbde647f95f3e83a62d56132b90da
2017-10-25 10:04:31 -07:00
Benedict Wong
d3a5792024 Merge "Add support for AES-GCM-ESP as an IPSec algorithm"
am: b6df7f0d35

Change-Id: Ic099206a28c4f21fa796969c953a8d4e81e8495b
2017-10-19 17:14:53 +00:00
Benedict Wong
0febe5ece5 Add support for AES-GCM-ESP as an IPSec algorithm
Allows native AES-GCM-ESP to be used as an IPSec transport/tunnel mode
algorithm with kernel support

Bug: 63589918
Test: IPsecService tests added, existing ones pass
Change-Id: Ie1a9a902be205f269aa37bf956198f2e5b177c21
2017-10-18 11:22:24 -07:00
Brad Ebinger
bb38194a55 Merge "Add new Download Error Codes" am: e9bd5449b5 am: 946ff79971
am: 014d73e287

Change-Id: I7c7dc265bf5ba27b61794d114937c2c4c0816470
2017-10-11 22:56:47 +00:00
Brad Ebinger
946ff79971 Merge "Add new Download Error Codes"
am: e9bd5449b5

Change-Id: I8fa3c3dcc5104a5326a680ae186c9285a7e47358
2017-10-11 22:24:58 +00:00
Brad Ebinger
e9bd5449b5 Merge "Add new Download Error Codes" 2017-10-11 22:12:26 +00:00
Brad Ebinger
6fb5072fa8 Add new Download Error Codes
Adds new MBMS Download Session error codes to allow for
more fine grained error reporting to the client app.

Test: Manual
Change-Id: I9c2163d934835efaaa145e4c0f8a91838d84aa1e
2017-10-10 12:50:49 -07:00
Brad Ebinger
d0c9d44df9 Merge "Require DownloadRequest#Builder to have mandatory Source URI" am: 432c2b0fb9 am: 3b6df532f3
am: 8765abcc9e

Change-Id: I25b39008317e333d422cd32a0c6348c010ca280f
2017-10-10 18:57:23 +00:00
Brad Ebinger
3b6df532f3 Merge "Require DownloadRequest#Builder to have mandatory Source URI"
am: 432c2b0fb9

Change-Id: I3332d44105c6ce4f8d4223caad66715c4c67d52f
2017-10-10 18:39:56 +00:00
Brad Ebinger
432c2b0fb9 Merge "Require DownloadRequest#Builder to have mandatory Source URI" 2017-10-10 18:27:36 +00:00
Brad Ebinger
ea737a8e1e Require DownloadRequest#Builder to have mandatory Source URI
This change modifies the API to require that the
DownloadRequest#Builder includes the Source URI as a mandatory,
non-null parameter.

Test: Manual, Telephony Test MBMS app
Change-Id: I7d44e977314a57fdf063aa233bfb978b48ebf1db
2017-10-10 00:06:04 +00:00
Brad Ebinger
548a7e607d Merge "Adds a filtering bitmask to DownloadStateCallback" am: 177bd65211 am: 387b90aa97
am: 6ed82dc67b

Change-Id: Iab96a457f45f759267b9a5a41df533c9988ede94
2017-10-03 21:23:01 +00:00
Brad Ebinger
387b90aa97 Merge "Adds a filtering bitmask to DownloadStateCallback"
am: 177bd65211

Change-Id: I64950a42e8079a41105d90ea6c584ca6f940a64e
2017-10-03 20:55:50 +00:00
Brad Ebinger
177bd65211 Merge "Adds a filtering bitmask to DownloadStateCallback" 2017-10-03 20:23:00 +00:00
Brad Ebinger
5fc881f7e7 Merge "Decouple Content Name Locale from Content Language Locale" am: a830e83028 am: 768b6c5e4a
am: 4b76f8420f

Change-Id: If87094f15e3a1dfe36d37745ed3d2cf79cc441f1
2017-10-03 19:07:46 +00:00
Brad Ebinger
768b6c5e4a Merge "Decouple Content Name Locale from Content Language Locale"
am: a830e83028

Change-Id: I225e8b71f53d584e1c8a6325dc2bb57421617dc4
2017-10-03 18:45:43 +00:00