Commit Graph

6208 Commits

Author SHA1 Message Date
Yan Yan
8dbc89396d Merge "Use #setNetwork and #getNetwork for IkeSessionParams" am: 3022c5437c am: cc0c3a5f62 am: faf572b9ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675285

Change-Id: I94d750ce60a8caaeb221875cfa8ef3f570863ab9
2021-04-19 19:18:22 +00:00
Yan Yan
3022c5437c Merge "Use #setNetwork and #getNetwork for IkeSessionParams" 2021-04-19 17:04:25 +00:00
Sarah Chin
7fa5d35a45 Merge "Update documentation for setSubscriptionOverride" into sc-dev 2021-04-16 23:58:42 +00:00
Paul Hu
3d41ec9b45 Merge "Add NWM#getWatchlistConfigHash to test api for testing" am: e87f10b9a6 am: 4d4af2bd05 am: b3ebae141f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675628

Change-Id: I08164c986c247fa36aa25afc533f9ad656ab8850
2021-04-16 09:31:07 +00:00
Lorenzo Colitti
9678fd13cd Merge "Don't expose raw IBinder APIs." am: 4b4cc572c0 am: 3aba6fdd68 am: 4911a46b2c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676436

Change-Id: Ic45558c739cfb065e5c9d6fb5ebf485ceb9a630f
2021-04-16 08:48:41 +00:00
Paul Hu
e87f10b9a6 Merge "Add NWM#getWatchlistConfigHash to test api for testing" 2021-04-16 08:10:33 +00:00
Sarah Chin
f7e9c836c4 Update documentation for setSubscriptionOverride
Test: build
Fix: 180496714
Change-Id: Iebfcd0ece1891c1b77d132b92e93d8c1eea3aa6e
2021-04-15 19:53:14 -07:00
Lorenzo Colitti
103e78ed48 Don't expose raw IBinder APIs.
APIs should not expose raw IBinder objects.

Fix: 184735751
Test: builds, boots
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCases:android.net.cts.DnsResolverTest
Change-Id: Ia0c4170def31123f0b79318fec2cfe02e4fcd3bf
2021-04-15 18:47:21 +09:00
Treehugger Robot
2d4f2324cf Merge "Make TYPE_VPN_LEGACY no longer deprecated." am: 590949fd61 am: 9d5240865f am: 0d3acacdd5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675627

Change-Id: Ib6419d4d408c5f4859bac2e92b1811dffd513c9c
2021-04-15 05:50:32 +00:00
paulhu
675ffd271b Add NWM#getWatchlistConfigHash to test api for testing
Bug: 185309847
Test: m update-api
Change-Id: I4fb1503827b3a9e3105c2340ffbaaa2ec593d96b
2021-04-14 23:54:55 +08:00
Lorenzo Colitti
fb7f36b3cb Make TYPE_VPN_LEGACY no longer deprecated.
Addresses API council feedback.

Test: m
Fix: 185311050
Change-Id: I93c8c46ceda7b08f9fc0ab8930f6a3c960f30930
2021-04-14 23:30:48 +09:00
Benedict Wong
9dfb804a4e Convert VcnNetworkProvider to use NetworkOffers
This change brings VcnNetworkProvider to full functionality in the new
NetworkProvider paradigm, where NetworkProviders offer networks, and are
notified based on NetworkOfferCallbacks.

Bug: 185204197
Test: atest FrameworksVcnTests
Change-Id: I88c69c0be9f6fd81839fb1595ed00341001694a5
2021-04-14 05:41:51 +00:00
Yan Yan
66a9973b9d Use #setNetwork and #getNetwork for IkeSessionParams
This pacth changes VCN to call #setNetwork and #getNetwork instead
of #setConfiguredNetwork and #getConfiguredNetwork because the
later two methods will not be APIs.

This patch also changes VCN unit tests to build an IkeSessionParams
without a Context because the constructor requring a Context
is deprecated.

Bug: 180521384
Test: FrameworksVcnTests, CtsVcnTestCases
Change-Id: I971d0d1b6824890c58263a1960f3b8d0e66fe7d1
2021-04-13 21:46:53 -07:00
Paul Hu
036d189a8d Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" into sc-dev 2021-04-13 02:05:21 +00:00
paulhu
016950a485 Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT
As API review feedback, rename Build#VERSION#FIRST_SDK_INT to
Build#VERSION#DEVICE_INITIAL_SDK_INT. As well as update all usage
in frameworks and tests.

Bug: 184735771
Test: m
Change-Id: I72660959cb4e638a8e80fcf2f4e96ea172969f44
2021-04-09 15:47:36 +08:00
Treehugger Robot
2eb331a032 Merge "Add documentation on EthernetNetworkSpecifier API" am: 682a98d823 am: 02471bd905 am: 7fa8f1fa68
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669186

Change-Id: I350d4b3d3c3b146f48480475a21b5dbe718ffc36
2021-04-09 02:37:18 +00:00
Treehugger Robot
682a98d823 Merge "Add documentation on EthernetNetworkSpecifier API" 2021-04-09 01:26:54 +00:00
Remi NGUYEN VAN
f9dae9fec6 Add documentation on EthernetNetworkSpecifier API
Add javadoc on the constructor and getInterfaceName method.

Fixes: 182979732
Test: m
Change-Id: Iced805149a8344b953331501b48184661be0053a
2021-04-08 15:32:08 +09:00
Sudheer Shanka
d01e3f164d Fix an issue in NPMS where ALLOWED_REASON_SYSTEM will be ignored.
Bug: 184701934
Test: atest services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
Change-Id: Ic430eed075f466e1c50552053a100809a2780ba7
Merged-In: Ic430eed075f466e1c50552053a100809a2780ba7
2021-04-07 05:11:25 +00:00
Sudheer Shanka
59041bd9f4 Fix an issue in NPMS where ALLOWED_REASON_SYSTEM will be ignored.
Bug: 184701934
Test: atest services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
Change-Id: Ic430eed075f466e1c50552053a100809a2780ba7
2021-04-06 22:07:43 -07:00
Kweku Adams
9496d1170a Merge "Check network blocked reasons for job satisfaction." into sc-dev 2021-04-06 15:04:01 +00:00
Les Lee
b156dbcb90 Merge "Fix Wi-Fi SSID null handling" am: cadd76044e am: 114e0a0dd8 am: 8874e81cf7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624059

Change-Id: Iefb2bd39b51072cda3d4239e031ab00bd2e6f5c4
2021-04-06 06:10:38 +00:00
Les Lee
cadd76044e Merge "Fix Wi-Fi SSID null handling" 2021-04-06 03:52:52 +00:00
Paul Hu
32de19f353 Merge "Remove unused method checkUidNetworkingBlocked" am: 7cd588e210 am: 88c64a0345 am: d67767b7f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657766

Change-Id: I069970241689bde2b615ac0fef523f155d1226f4
2021-04-06 03:21:12 +00:00
Paul Hu
7cd588e210 Merge "Remove unused method checkUidNetworkingBlocked" 2021-04-06 01:49:57 +00:00
Kweku Adams
5f2d4f348c Check network blocked reasons for job satisfaction.
Use the provided blocked connectivity reasons to determine whether a
job's network constraint is satisfied or not.

Bug: 171305774
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/job
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/job
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTests
Test: atest CtsJobSchedulerTestCases
Change-Id: I21b936b9b2f89e40073f8d1d7acb9032722006f1
2021-04-05 14:51:10 -07:00
Cody Kesting
2aca029981 Merge "Clarify docs for status codes in VcnStatusCallback." am: 36a84ebbaf am: 2ea2b734e5 am: f73591b47f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660643

Change-Id: Ib276041e5f3c5e0401bf466939384bfaa8801119
2021-04-02 03:43:50 +00:00
Cody Kesting
36a84ebbaf Merge "Clarify docs for status codes in VcnStatusCallback." 2021-04-02 01:24:25 +00:00
Cody Kesting
803668c0a3 Merge changes from topic "gateway-connection-id" am: 03f00e5a52 am: 2fa4b7b757 am: 1230749c35
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659162

Change-Id: Ic60a32e6cefab3807102f1ee2d6565a15e053a15
2021-04-01 20:20:59 +00:00
Cody Kesting
03f00e5a52 Merge changes from topic "gateway-connection-id"
* changes:
  Expose API for identifying GatewayConnections.
  Update identification for onGatewayConnectionError().
2021-04-01 18:27:28 +00:00
Cody Kesting
24aa7bc5cb Clarify docs for status codes in VcnStatusCallback.
This CL clarifies the documentation for status codes used in
VcnStatusCallback #onStatusChanged() and #onGatewayConnectionError, per
API Council feedback.

Bug: 182345902
Test: atest FrameworksVcnTests CtsVcnTestCases
Change-Id: I86770a19f3d9f9a42aa3713489943fbe78561773
2021-03-31 14:23:55 -07:00
Cody Kesting
5926d20e03 Expose API for identifying GatewayConnections.
This CL exposes the updated APIs for identifying GatewayConnections via
a user-configured String set in VcnGatewayConnectionConfig.Builder, as
requested by the API Council.

Bug: 182345902
Bug: 180522464
Test: atest FrameworksVcnTests
Change-Id: I10afd074906bc0f3831157dcee1da813b4cfce78
2021-03-31 14:23:29 -07:00
Cody Kesting
52265aab76 Update identification for onGatewayConnectionError().
This CL updates the identification method for
VcnStatusCallback#onGatewayConnectionErrror. Previously,
GatewayConnections were identified by an int[] specifying the
GatewayConnection's exposed NetworkCapabilities. Following API Council
feedback, this is updated to identify GatewayConnections by a
caller-provided String set in the VcnGatewayConnectionConfig.Builder.

Bug: 182345902
Bug: 180522464
Test: atest FrameworksVcnTests
Change-Id: I933c2330edb9bfc1b6bb62276debac02460e24f8
2021-03-31 14:22:54 -07:00
paulhu
6d5643f87e Remove unused method checkUidNetworkingBlocked
aosp/1612823 removed the usage from CS, no one is using
checkUidNetworkingBlocked() now. Thus, remove it from
NetworkPolicyManager, AIDL and NetworkPolicyManagerService.

Bug: 180084343
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases
Test: atest CtsHostsideNetworkTests
Test: atest FrameworksCoreTests:NetworkPolicyManagerTest
Test: atest FrameworksServicesTests:NetworkPolicyManagerServiceTest
Change-Id: I632efa4b775a0238bb912690d48e766597e5e623
2021-03-31 15:48:10 +08:00
Sudheer Shanka
a55c43879e Merge "Revert NPMS threshold to BFGS." into sc-dev 2021-03-30 17:51:51 +00:00
lesl
15d809b9f4 Fix Wi-Fi SSID null handling
When Wi-Fi SSID is null in NetworkCapabilities,
get Wi-Fi SSID from connection info (WifiInfo) which is non-null design.

Bug: 176396812
Test: FrameworksNetTests NetworkPolicyManagerServiceTest
Change-Id: I59c7d8f7e176d0c6bb100721269f3f6165f0ca21
2021-03-30 23:57:56 +08:00
Junyu Lai
3757df2e7d Merge "[SP31] Expose onSetWarningAndLimit System API" 2021-03-30 08:00:45 +00:00
Sudheer Shanka
05f75c2553 Merge "Remove NetworkPolicyManager.isUidBlocked() API." am: 9cff99d059 am: 433c866186 am: 4b3348f115
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652550

Change-Id: Ic5c9fb2603a010976bc93e5059e5548ee782005e
2021-03-29 17:45:42 +00:00
Sudheer Shanka
d3ba15beeb Remove NetworkPolicyManager.isUidBlocked() API.
It isn't used by ConnectivityService any more and even if
it needs such utility method in the future, we could create
one which is part of connectivity module and doesn't need
to be exposed as part of NetworkPolicyManager API surface.

Bug: 183696103
Test: atest ./tests/net/java/com/android/server/ConnectivityServiceTest.java
Change-Id: Ie3c681f88e4b2b9bb92d2224c5ea96b074f155d5
2021-03-29 12:39:12 +00:00
Junyu Lai
ac196a1e07 Merge "[SP28] Add API for set data warning" 2021-03-29 11:06:05 +00:00
Sudheer Shanka
d31f86401e Revert NPMS threshold to BFGS.
Earlier, we changed the threshold to IMP_FG to allow
HPJs to bypass power saving network restrictions but
later we made a change to instead use network capability
for HPJs, so reverting the threshold to BGFS.

Bug: 177641226
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I6c1916ca9e8ff9555bbacda678ce53f8373c8960
2021-03-26 13:02:07 -07:00
Lorenzo Colitti
58ee26218c Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452 am: 6456359a0e am: 8afa9811c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652214

Change-Id: I4d69b1ce096d83c311620950650460024ae348c0
2021-03-26 05:27:47 +00:00
Lorenzo Colitti
5ab70251e8 Add onBlockedStatusChanged(Network, int) to NetworkCallback.
This is similar to onBlockedStatusChanged(Network, boolean) but
it allows the callback holder to know the exact reason why
networking was blocked. It is useful to privileged system
components such as JobScheduler that are able to ignore some
blocked reasons but not others.

Also add a new BLOCKED_REASON_LOCKDOWN_VPN that is used when
networking is blocked because an always-on VPN is in
lockdown mode.

Also move BLOCKED_METERED_REASON_MASK to ConnectivityManager.
This is necessary because ConnectivityService must ensure that
the blocked status callbacks are correctly sent when meteredness
changes (e.g., a UID that is blocked on metered networks will
become unblocked on a network that becomes unmetered). In order
to do this it needs to know which reasons apply only on metered
networks.

Bug: 165835257
Test: unit tests in subsequent CLs in the stack
Change-Id: I647db4f5a01280be220288e73ffa85c15bec9370
2021-03-26 02:37:19 +09:00
junyulai
59b0a621e7 [SP31] Expose onSetWarningAndLimit System API
Test: atest NetworkPolicyManagerServiceTest NetworkStatsServiceTest
Bug: 149467454
CTS-Coverage-Bug: 183598414
Merged-In: I6f5e22e3a7b80a38cae9f3c5d7296a1dff34facf
Change-Id: I6f5e22e3a7b80a38cae9f3c5d7296a1dff34facf
  (cherry-picked from ag/13981689)
2021-03-25 09:32:43 +08:00
Junyu Lai
4a8feb1558 Merge changes I6f5e22e3,I6c486303 into sc-dev
* changes:
  [SP31] Expose onSetWarningAndLimit System API
  [SP29] Send interface warning bytes to NetworkStatsProvider
2021-03-24 19:25:53 +00:00
Sudheer Shanka
d533fa78b1 Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager.
These constants will now be including all the reasons for why an
uid's network access can be blocked, instead of only the
restrictions that could be imposed by NPMS.

Bug: 183473548
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Merged-In: I4c544415e12adf442fd2415c371b1b70a39c3aa4
Change-Id: I6dcea43fbefa9eac8b5a971b822a5be5422a54b4
2021-03-25 01:33:26 +09:00
TreeHugger Robot
956dd2834f Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." into sc-dev 2021-03-24 16:02:56 +00:00
junyulai
fc73e7ba4b [SP28] Add API for set data warning
To have better control and race-free of set data warning
to tether offload hardware, an interface of set warning and
limit at the same time in the NetworkStatsProvider is needed.

This is a no-op change which expose such interface with minimum
changes in service side to get build pass. The implementation
would be included in follow-up patches.

Test: atest NetworkStatsServiceTest
Test: atest NetworkPolicyManagerServiceTest
Test: atest GtsNetworkStackHostTestCases
Test: m doc-comment-check-docs
Bug: 149467454
Bug: 170699770
Bug: 170179169
Merged-In: I6ee661497f7dedb871c85786d1950cab951d8aa2
Change-Id: I6ee661497f7dedb871c85786d1950cab951d8aa2
  (cherry-picked from ag/13959436)
2021-03-24 22:48:26 +08:00
junyulai
80fb26a90d [SP31] Expose onSetWarningAndLimit System API
Test: atest NetworkPolicyManagerServiceTest NetworkStatsServiceTest
Bug: 149467454
CTS-Coverage-Bug: 183598414
Ignore-AOSP-First: avoid long automerger delay
Change-Id: I6f5e22e3a7b80a38cae9f3c5d7296a1dff34facf
2021-03-24 22:03:03 +08:00
Junyu Lai
b99a0bc491 Merge "[SP28] Add API for set data warning" into sc-dev 2021-03-24 10:22:08 +00:00