Commit Graph

3536 Commits

Author SHA1 Message Date
Jeff Sharkey
ca46c6beea Merge "Let tests enumerate all transports/capabilities." into pi-dev am: 8e6445a1a5
am: 75299cffec

Change-Id: If07e77c92046807235229a4f67ee087bdd7bccf1
2018-05-15 08:37:39 -07:00
Jeff Sharkey
75299cffec Merge "Let tests enumerate all transports/capabilities." into pi-dev
am: 8e6445a1a5

Change-Id: Ie5cd22cfa2b6a60510fd1e31d7ebcd8f6cc890a0
2018-05-15 08:27:40 -07:00
Jeff Sharkey
a5ee62f356 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.

Bug: 16207332
Test: atest com.android.cts.net.HostsideVpnTests
Change-Id: I35ca412512dc8515b44d5518e1ca4caa5bdc678f
2018-05-14 17:17:33 -06:00
Remi NGUYEN VAN
205fbfd220 Merge "Fix android.net.SSLTest" am: ef43ea3238 am: 60b828ca86
am: f0e3b091f8

Change-Id: I3cec265b459df9f956fd2f5d56f9b7ff18dca53b
2018-05-09 19:41:07 -07:00
Remi NGUYEN VAN
f0e3b091f8 Merge "Fix android.net.SSLTest" am: ef43ea3238
am: 60b828ca86

Change-Id: I482bd9734f62ba1554e0d7e0bf889b23450303ee
2018-05-09 19:31:38 -07:00
Remi NGUYEN VAN
60b828ca86 Merge "Fix android.net.SSLTest"
am: ef43ea3238

Change-Id: If877193c05bf6b932aceacc93b27241e619a21b2
2018-05-09 18:35:47 -07:00
Remi NGUYEN VAN
81774d1fa5 Fix android.net.SSLTest
The test is failing because of lack of visibility (IllegalAccessError).
Also rename it to match the tested class, migrate to JUnit4, and remove
an old test that is unused (suppressed), relies on third-party servers
and is not a proper unit test (would try to make real network requests).

Test: test now passes
Change-Id: I5032a056df83d4f572d89860b52bd85a1993d9dc
2018-05-08 15:31:58 +09:00
android-build-prod (mdb)
5b68325591 Merge "Add the list of private DNS addresses to LinkProperties"
am: 1100e84175

Change-Id: I76ec108862edfb557496ddcd8b5c73202cd674de
2018-04-27 00:56:10 -07:00
Chalard Jean
03dbf6bd5e Add the list of private DNS addresses to LinkProperties
(clean cherry-pick from ag/3874803)

Test: atest android.net.LinkPropertiesTest, also new tests pass
Bug: 73641539
Change-Id: If33a35b1354a67db09411ff098f20064797296ad
Merged-In: I4b739c56e658690532ae9deb0b9a3bc9b2adf8b0
Merged-In: I6bdbef78d078d68534c8e07e9af031ce374560ef
2018-04-27 13:32:10 +09:00
Nathan Harold
37baab43f7 Merge "Rework Exception Handling for IpSecManager" into pi-dev am: 16c671dc9a
am: 23d8eed9de

Change-Id: Ic1f560070d12f3bdeb5c07316aad7ebed9719f6f
2018-04-25 12:01:34 -07:00
Nathan Harold
23d8eed9de Merge "Rework Exception Handling for IpSecManager" into pi-dev
am: 16c671dc9a

Change-Id: I9c1acdc79053c70a8484935f61a537379b9be927
2018-04-25 11:51:00 -07:00
Nathan Harold
16c671dc9a Merge "Rework Exception Handling for IpSecManager" into pi-dev 2018-04-25 18:34:10 +00:00
Nathan Harold
ddeb90aa9d Rework Exception Handling for IpSecManager
In order to properly support EOPNOTSUPP this CL
applies a consistent approach to handling Exceptions.
Hereafter, all exceptions that aren't of a special
method-specific type (such as SpiUnavailableException)
will all be returned to the calling process unchanged.
At the API call site, the ServiceSpecificException,
which is really an Errno, will be inspected and either
converted to an unchecked exception for types we know,
or it will be converted to an IOException in cases where
that method can return a checked exception. In cases
where we do not expect an errno, we will simply throw
a generic RuntimeException. This means all API calls
will now properly throw UnsupportedOperationException
and may be CTS tested accordingly.

Bug: 72420898
Test: runtest frameworks-net
Change-Id: I4a00e221618896223fcdb4b4279fb14cd14e34d8
2018-04-24 19:04:08 -07:00
Lorenzo Colitti
4d121ff87f Merge "Actually @hide unwanted capability methods." into pi-dev am: a09c06a6c1
am: dc86aaa112

Change-Id: I923e5377a1abe761217612452cbfdba752e53de2
2018-04-24 14:50:14 -07:00
Lorenzo Colitti
dc86aaa112 Merge "Actually @hide unwanted capability methods." into pi-dev
am: a09c06a6c1

Change-Id: I80a88123b16c54734306da7e5dc0670972041648
2018-04-24 14:43:06 -07:00
Lorenzo Colitti
a09c06a6c1 Merge "Actually @hide unwanted capability methods." into pi-dev 2018-04-24 21:20:25 +00:00
Lorenzo Colitti
19c0ccaa8c Actually @hide unwanted capability methods.
Bug: 77601789
Test: builds, boots
Test: make doc-comment-check-docs
Change-Id: I7a913b83ab5110047d187564b3a1b0bbe1631942
2018-04-24 13:12:56 +09:00
Chalard Jean
1df73dd267 Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev am: f12a2130a4
am: 1bb54ae872

Change-Id: I6bdbef78d078d68534c8e07e9af031ce374560ef
2018-04-20 04:59:52 -07:00
Chalard Jean
1bb54ae872 Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev
am: f12a2130a4

Change-Id: I4b739c56e658690532ae9deb0b9a3bc9b2adf8b0
2018-04-20 04:49:43 -07:00
Chalard Jean
9419b11458 Add the list of private DNS addresses to LinkProperties
Test: atest android.net.LinkPropertiesTest, also new tests pass
Bug: 73641539
Change-Id: If33a35b1354a67db09411ff098f20064797296ad
2018-04-20 16:48:43 +09:00
Jeff Sharkey
5ee9434e9c Merge "Return "null" cycles for deprecated callers." into pi-dev am: 9eb0a655cc
am: fcbbe0f9c7

Change-Id: Ie4d4431a56dc4b7062d547b9e6b7828c13a64cb5
2018-04-14 19:03:49 -07:00
Jeff Sharkey
fcbbe0f9c7 Merge "Return "null" cycles for deprecated callers." into pi-dev
am: 9eb0a655cc

Change-Id: Ibe9928effca29598c59f440018977474debbee4b
2018-04-14 18:39:00 -07:00
Jeff Sharkey
e67463db5f Return "null" cycles for deprecated callers.
Callers using the deprecated Pair<ZonedDateTime, ZonedDateTime>
interface don't always check hasNext() before calling next(), so
give them (null, null) results instead of throwing.

Bug: 78020489
Test: builds, boots
Change-Id: Ibaeac646fa4e12e3e748cd7c706524d51dbeaafe
2018-04-13 14:38:04 -06:00
Chalard Jean
53b2e589cd Merge "Add a new ssid field in NetworkCapabilities." into pi-dev am: 878d0e90b5
am: 8edf6543d2

Change-Id: I6dd1aba6fde5a502b4a9145cf16393d8ce623c89
2018-04-13 02:23:18 -07:00
Chalard Jean
8edf6543d2 Merge "Add a new ssid field in NetworkCapabilities." into pi-dev
am: 878d0e90b5

Change-Id: Ia1f4e51b7c2e9118789242cf6d9e7576c4167cda
2018-04-13 02:14:02 -07:00
TreeHugger Robot
878d0e90b5 Merge "Add a new ssid field in NetworkCapabilities." into pi-dev 2018-04-13 08:59:23 +00:00
Chalard Jean
b03a6229b8 Add a new ssid field in NetworkCapabilities.
Bug: 77891227
Test: frameworks-net
Change-Id: Ifba33ecd48ccecce7e8f8d05ff70bb85653f6163
2018-04-13 15:38:35 +09:00
Jeff Sharkey
dcc615a028 Merge "APIs to disable data usage notifications." into pi-dev am: f0b9fbebc0
am: 568a972669

Change-Id: I8bfcf47c10e5f43f963fe012e98d0afd83630e64
2018-04-11 16:51:25 -07:00
Jeff Sharkey
568a972669 Merge "APIs to disable data usage notifications." into pi-dev
am: f0b9fbebc0

Change-Id: I7b5bd380f00b6e94da79f43b354ecfc52df3f8e4
2018-04-11 16:14:26 -07:00
TreeHugger Robot
f0b9fbebc0 Merge "APIs to disable data usage notifications." into pi-dev 2018-04-11 23:05:03 +00:00
Jeff Sharkey
0a5570d49d APIs to disable data usage notifications.
Certain carriers have requested the ability to disable the warning,
limit, and rapid data usage notifications shown by the OS, so give
them that ability on a per-subId basis.  (The notifications are still
enabled by default.)

Unhide NOT_CONGESTED to match setSubscriptionOverrideCongested().

Fix bug in getPrimarySubscriptionPlanLocked() to find the first
currently active plan; the first non-recurring plan may be no longer
active.  Fix bug in SubscriptionPlan which allowed invalid negative
or zero-length Period objects.

Bug: 77851691, 77506882, 77662747
Test: atest com.android.server.NetworkPolicyManagerServiceTest
Test: atest android.telephony.cts.SubscriptionManagerTest
Exempt-From-Owner-Approval: SDK deadline, responding to API feedback
Change-Id: Ib6e6dbadd5022937c3f0661ab4b66aa617f0b5af
2018-04-11 22:07:40 +00:00
Nathan Harold
adff790058 Merge "[DO NOT MERGE] - Hide Tunnel Mode IpSec API" into pi-dev
am: 68e5f0f242

Change-Id: I2542b4dcb94b306e3fe2e3e87051f1bd6a481561
2018-04-11 11:39:56 -07:00
Nathan Harold
68e5f0f242 Merge "[DO NOT MERGE] - Hide Tunnel Mode IpSec API" into pi-dev 2018-04-11 17:09:07 +00:00
Pavel Maltsev
1b8c42d15f Merge "Remove unwanted capabilitiy from the java-doc" into pi-dev
am: 1856d61f9a

Change-Id: I7fef43cce3cfe17dae6a5e4f564ad8857371502a
2018-04-10 20:58:01 -07:00
TreeHugger Robot
1856d61f9a Merge "Remove unwanted capabilitiy from the java-doc" into pi-dev 2018-04-11 03:26:22 +00:00
Nathan Harold
0486b927b3 [DO NOT MERGE] - Hide Tunnel Mode IpSec API
Hide the tunnel mode of the IpSec API because
there is a disincentive to launch it without
a supported customer use case. That use case,
IWLAN is having its APIs hidden, so we should
hide these as well to avoid constraining future
implementation.

Also, due to issues with the lifetime of the NATT
management object, this API needs to be hidden
until such time as the lifetime of the Keepalive
can be handled independently of the lifetime of
a Transform.

Bug: 72523623
Test: compilation (api removal)
Change-Id: I076030bdbab1cd7d69f6a034577d529970b050dc
2018-04-10 19:24:07 -07:00
Jeff Sharkey
4862a62845 Merge "Disable roaming sanity checking." into pi-dev
am: 75f9459c21

Change-Id: I93bb07583ef90fb8c31c5c9a0c3e2c6e4968f975
2018-04-09 18:15:36 -07:00
Chad Brubaker
1c0e63f2fd Merge "Make isSameTrustConfiguration public API" into pi-dev
am: eed55b3b15

Change-Id: I0cfc2eda840f58194d7054930a3111a15a8b8e4b
2018-04-09 18:07:59 -07:00
Jeff Sharkey
4cd485f8e5 Merge "API council requested tweaks to SubscriptionPlan." into pi-dev
am: 5e0d360411

Change-Id: I447d4041d1dd0751147d13792b07d6617b27978a
2018-04-09 17:09:34 -07:00
Jeff Sharkey
75f9459c21 Merge "Disable roaming sanity checking." into pi-dev 2018-04-09 23:57:28 +00:00
TreeHugger Robot
eed55b3b15 Merge "Make isSameTrustConfiguration public API" into pi-dev 2018-04-09 23:53:18 +00:00
Jeff Sharkey
5e0d360411 Merge "API council requested tweaks to SubscriptionPlan." into pi-dev 2018-04-09 23:20:43 +00:00
Jeff Sharkey
2b3f6d5c4c Disable roaming sanity checking.
We've traced down all code paths where NetworkInfo.isRoaming() and
NET_CAPABILITY_NOT_ROAMING can disagree, so we're only left with
noise that happens from NetworkAgent race conditions when someone
asks for a NetworkState between pending NetworkInfo and
NetworkCapabilities updates.

We can look at adding a way for a NetworkAgent to update these
two objects atomically, but not for this release.

Bug: 70174865
Test: builds, boots
Change-Id: I830e1fc6dc922e9eb7f8c2698d75181e00aaf7fb
2018-04-09 16:17:23 -06:00
Benedict Wong
d74a971fc2 Merge "Force creation of Socket upon Transform application" into pi-dev 2018-04-09 20:55:30 +00:00
Pavel Maltsev
bb5b3af85f Remove unwanted capabilitiy from the java-doc
Per API council feedback remove unwanted capaibility from public API
java docs

Bug: 77601789
Test: make docs
Test: build and flash
Change-Id: Ia7fd6d79546bf99448f8f2bda0370c7230ea4527
2018-04-09 13:16:00 -07:00
Erik Kline
d7375ac9d7 Support bluetooth not using MultinetworkPolicyTracker
This required advancing the IpManager to IpClient refactoring
(Bluetooth used IpManager and friends). Most importantly, the
Bluetooth code used WaitForProvisioningCallback, so this is
moved into IpClient proper now. Also: some more renaming
cleanup.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 62476366
Bug: 72663849

Merged-In: I5e5b2c59ad3ea9ad574e8e683bcab3b09cfe0791
Merged-In: I89b45310181d952129fb2294db63654da9b4057f
Change-Id: I9eee2a9d5c31cdd48a054a7edc3403584efb1864
(cherry picked from commit 8d1fe54be1)
2018-04-09 03:05:37 -07:00
Erik Kline
08eab46ef9 Merge "Support bluetooth not using MultinetworkPolicyTracker" am: ed631bf5aa
am: bfcbe96fd0

Change-Id: I5e5b2c59ad3ea9ad574e8e683bcab3b09cfe0791
2018-04-09 02:47:01 -07:00
Erik Kline
bfcbe96fd0 Merge "Support bluetooth not using MultinetworkPolicyTracker"
am: ed631bf5aa

Change-Id: I889e58c1e102f6b0cddebed4454f30fad701b025
2018-04-09 01:51:34 -07:00
Erik Kline
8d1fe54be1 Support bluetooth not using MultinetworkPolicyTracker
This required advancing the IpManager to IpClient refactoring
(Bluetooth used IpManager and friends). Most importantly, the
Bluetooth code used WaitForProvisioningCallback, so this is
moved into IpClient proper now. Also: some more renaming
cleanup.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 62476366
Bug: 72663849

Change-Id: I9eee2a9d5c31cdd48a054a7edc3403584efb1864
2018-04-08 23:09:36 -07:00
Lorenzo Colitti
142f57e261 Remove unwanted capability code per API council feedback.
am: 4c6f4a65b6

Change-Id: I359aad5d7dceb2b188544db18424598decf14c08
2018-04-06 19:56:30 -07:00