Commit Graph

8155 Commits

Author SHA1 Message Date
Aaron Huang
9fef5a5cf0 Merge "Make NattKeepalivePacketData @SystemApi" 2020-01-14 14:36:09 +00:00
paulhu
ce12f80581 Expose SocketKeepalive#SUCCESS as SystemApi
Support wifi mainline module usage.

Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
      atest FrameworksNetTests
Change-Id: I94171b2dc4f26442df918547bf8bc40953f63f2e
2020-01-14 21:42:56 +08:00
Remi NGUYEN VAN
04b18a9e7b Add NetworkRequest#satisfiedBy to SystemApi
The API is useful for NetworkFactories to select requests based on
capabilities.
This mirrors NetworkCapabilities#satisfiedByNetworkCapabilities

Test: m
Bug: 138306002
Change-Id: I1d4a928256951397cabde5c352a872fd48d85859
2020-01-14 21:45:38 +09:00
Remi NGUYEN VAN
93de608316 Remove handling of EVENT_UNFULFILLABLE_REQUEST
This message is not being sent by any component anymore.

Test: built, flashed, WiFi and telephony working
Test: atest FrameworksNetTests
Bug: 138306002
Change-Id: I5b1ec3136ae8a0a6928e0fb2cda3d5f5e2ca657f
2020-01-14 21:45:30 +09:00
Aaron Huang
2429c7091c Remove framework code that has moved to frameworks/libs/net
Add srcs to framework and change import path.
Remove the codes which are moved to frameworks/libs/net.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Bug: 143925787
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests
      atest ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef
2020-01-14 18:10:39 +09:00
Chalard Jean
1426060355 Merge "Have registerNetworkAgent return a Network." 2020-01-14 07:06:37 +00:00
Automerger Merge Worker
abf06a174d Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: baf25cde90 am: 385ec77624 am: de99f55513
Change-Id: I5706151c291cbdbc3a1f73ebb3669f56a61509ba
2020-01-14 06:27:10 +00:00
Automerger Merge Worker
de99f55513 Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: baf25cde90 am: 385ec77624
Change-Id: I310847d36d37a4d7a0c3a8675546376a300680f2
2020-01-14 06:17:26 +00:00
Lorenzo Colitti
385ec77624 Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi"
am: baf25cde90

Change-Id: I5b8def0055bb8f7062405b1f354c1edf6292a129
2020-01-13 22:04:13 -08:00
Lorenzo Colitti
baf25cde90 Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" 2020-01-14 05:30:14 +00:00
Lorenzo Colitti
640fa9a6ac Merge "Add a Builder to NetworkAgentConfig, and make it SystemApi." 2020-01-14 05:01:06 +00:00
Chalard Jean
b0a42f7284 Have registerNetworkAgent return a Network.
This is more useful.

Bug: 135998869
Test: FrameworkNetTests FrameworksWifiTests
Change-Id: I74710b396fa3cec6fbae08d3dcab5bc90dc2e669
2020-01-14 13:59:55 +09:00
markchien
d6eeffd079 Unhide NetworkRequest API which use legacy type
Bug: 144753389
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: I349da06769e9ffcee6bb42f51ab454e0ef774fb3
Merged-In: I349da06769e9ffcee6bb42f51ab454e0ef774fb3
2020-01-14 04:56:54 +00:00
markchien
fd051db78b Unhide NetworkRequest API which use legacy type
Bug: 144753389
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: I349da06769e9ffcee6bb42f51ab454e0ef774fb3
2020-01-14 12:54:40 +08:00
Lorenzo Colitti
5b2e000f6d Add a Builder to NetworkAgentConfig, and make it SystemApi.
Currently, only support the three elements in the config that are
known to be used.

Bug: 138306002
Test: builds, boots
Test: atest FrameworksTelephonyTests
Change-Id: I1d231ec2ddcff97c039bcbc815a39c1d3e26c410
2020-01-14 11:43:53 +09:00
Automerger Merge Worker
5e6e597748 Merge "Support reevaluation request from captive portal app" am: 254c3d830e am: 006e9bc1e7 am: 5980ff839e
Change-Id: Id0c020ade4c7de71f7540a82d84045e131ea25e2
2020-01-14 02:33:53 +00:00
Automerger Merge Worker
5980ff839e Merge "Support reevaluation request from captive portal app" am: 254c3d830e am: 006e9bc1e7
Change-Id: Ie186aeac83cf30478ba0fedc0686b5e506e1add2
2020-01-14 02:17:06 +00:00
Chiachang Wang
006e9bc1e7 Merge "Support reevaluation request from captive portal app"
am: 254c3d830e

Change-Id: I5f376b4a342557b91b70d892308469b1fdda2363
2020-01-13 18:05:03 -08:00
paulhu
74357e70a8 Expose ConnectivityManager#TYPE_NONE as SystemApi
Support wifi mainline module usage.

Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
      atest FrameworksNetTests
Change-Id: Ia496aaeaf74fa44764640fd2b97c417509e040aa
2020-01-14 10:02:30 +08:00
Chiachang Wang
254c3d830e Merge "Support reevaluation request from captive portal app" 2020-01-14 01:42:22 +00:00
Aaron Huang
aead9c64fa Make NattKeepalivePacketData @SystemApi
Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests

Change-Id: I687f1a8a4b82cb7e4a0dfeb24f0b23a4de6d5287
2020-01-14 01:45:28 +08:00
Automerger Merge Worker
4a652ef131 Merge changes from topic "sp04" am: 429d86ae3c am: 3402bbf714 am: 75f84db7f5
Change-Id: I786eb5c594b325bec934aa0ca4432405dac39db4
2020-01-13 14:48:20 +00:00
Automerger Merge Worker
d34181656c [SP04] add unit test for NetworkStatsProvider am: 276921b6e1 am: 85f2dd96fc am: 7d46ce14c9
Change-Id: Ic48609b113a7174204eaa2207901c8110d76f65f
2020-01-13 14:48:10 +00:00
Automerger Merge Worker
75f84db7f5 Merge changes from topic "sp04" am: 429d86ae3c am: 3402bbf714
Change-Id: I67f56321014c282cfaf86863a988fd28f9cb124d
2020-01-13 14:28:14 +00:00
Automerger Merge Worker
7d46ce14c9 [SP04] add unit test for NetworkStatsProvider am: 276921b6e1 am: 85f2dd96fc
Change-Id: I0ce508b3ccf22b01603de7246b2068d3b1a2afcd
2020-01-13 14:28:10 +00:00
Junyu Lai
3402bbf714 Merge changes from topic "sp04"
am: 429d86ae3c

Change-Id: Ib2b96e64074a575c4d1a682e34bf6682c2fe4830
2020-01-13 06:12:54 -08:00
junyulai
85f2dd96fc [SP04] add unit test for NetworkStatsProvider
am: 276921b6e1

Change-Id: Icd440ff9086604cb0baaa4cb3e8e458dcda3bb97
2020-01-13 06:12:48 -08:00
Junyu Lai
429d86ae3c Merge changes from topic "sp04"
* changes:
  [SP05] add unit test for onStatsProviderLimitReached in NPMS
  [SP04] add unit test for NetworkStatsProvider
  [SP03] support registerNetworkStatsProvider API
  [SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull
2020-01-13 14:09:52 +00:00
junyulai
276921b6e1 [SP04] add unit test for NetworkStatsProvider
Test: atest NetworkStatsServiceTest
Bug: 130855321
Change-Id: I0c19d8bedcb9398da3f464efe01e775fde9f8a78
2020-01-13 14:43:06 +08:00
Chiachang Wang
938bfba0c3 Support reevaluation request from captive portal app
CaptivePortalLogin use similar way to validate the network as
NetworkMonitor. Provide API to reuse NetworkMonitor facilities
for consistent captive portal detection.

Bug: 134892996
Test: atest FrameworksNetTests NetworkStackTests NetworkStackNextTests
Test: manually test with captive portal Wi-Fi
Test: make system-api-stubs-docs-update-current-api \
      test-api-stubs-docs-update-current-api
Change-Id: I6f039eae7ceb18eb6c3cf15587cdc27a7fe35b00
2020-01-13 14:28:02 +08:00
Lorenzo Colitti
8dd13a8109 Rename NetworkMisc to NetworkAgentConfig.
NetworkMisc is not really an appropriate name for a system API.

Bug: 138306002
Test: builds, boots, wifi works, telephony works
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: I621cfbe165996c67b201ca2dd2f95a5ab9af10ee
2020-01-13 15:01:52 +09:00
Lorenzo Colitti
c58ecd5f33 Make NetworkAgent stop subclassing Handler.
Subclassing Handler is not appropriate for a system API because
it is an implementation detail and allows users of this class to
post messages to the handler in ways that allow inappropriate
access to internals that aren't part of the API contract.

Also fix some lint errors.

Test: builds
Bug: 138306002
Change-Id: I79478ceff6bbcae879d1025098d177de0d15dbee
2020-01-13 14:49:15 +09:00
Automerger Merge Worker
8ae3471952 Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: 3efc93af3d am: 243e5f21ea
Change-Id: I97bd2471b04d9a6291b03a989ccd618c2dc70c6e
2020-01-13 04:51:33 +00:00
Automerger Merge Worker
243e5f21ea Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: 3efc93af3d
Change-Id: If8cd7bd2c1fe4b698113eb761ed8e2b4f9580cf0
2020-01-13 04:34:10 +00:00
Lorenzo Colitti
3efc93af3d Merge changes I7ea39b80,I6b9979f3
am: 310d1dac0d

Change-Id: I33b163077fcc270f79a11a43e481767934e8ac9e
2020-01-12 20:19:21 -08:00
Lorenzo Colitti
a86fae785a Stop using NetworkFactory in connectivity code.
Bug: 138306002
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: I6b9979f343108c0c077abd86ae1c21e5ece0cccc
2020-01-12 17:40:02 +09:00
Automerger Merge Worker
934e051607 Merge "Add NetworkCapabilities#deduceRestrictedCapability" am: 0e82d1c50d am: 2d976e6c9e am: 02ee974ee1
Change-Id: I9d593d245287362aad82d70ac5fed4d6339f82d7
2020-01-10 09:55:33 +00:00
Automerger Merge Worker
02ee974ee1 Merge "Add NetworkCapabilities#deduceRestrictedCapability" am: 0e82d1c50d am: 2d976e6c9e
Change-Id: I3b07f1715e550568014becb9f987963777da4bba
2020-01-10 09:43:41 +00:00
paulhu
2d976e6c9e Merge "Add NetworkCapabilities#deduceRestrictedCapability"
am: 0e82d1c50d

Change-Id: I3c451ed7725cacd5672e7b1920a0725239015e68
2020-01-10 01:32:25 -08:00
Treehugger Robot
0e82d1c50d Merge "Add NetworkCapabilities#deduceRestrictedCapability" 2020-01-10 09:27:31 +00:00
Automerger Merge Worker
f82ab34c40 Merge "Expose DhcpInfo parcelable interface implementation methods" am: 617e9bd709 am: 6817693ef3 am: badb0c36b6
Change-Id: I202ba0c2fe026186c59bb0d7b58d8bb8b5be98c2
2020-01-10 08:42:17 +00:00
Automerger Merge Worker
badb0c36b6 Merge "Expose DhcpInfo parcelable interface implementation methods" am: 617e9bd709 am: 6817693ef3
Change-Id: I6bf8b0646d2a9c9df8451feb51b05bf00739c4c3
2020-01-10 08:34:19 +00:00
Aaron Huang
6817693ef3 Merge "Expose DhcpInfo parcelable interface implementation methods"
am: 617e9bd709

Change-Id: Ie432bee8641bd0c2e94adb04329ea6e80e8ed72c
2020-01-10 00:10:03 -08:00
Aaron Huang
617e9bd709 Merge "Expose DhcpInfo parcelable interface implementation methods" 2020-01-10 08:05:24 +00:00
Automerger Merge Worker
1b0585bb81 [automerger skipped] Merge "Add keepalive related methods and fields to system APIs" am: 434bc5adf4 am: 57e9fd7e5a am: 6e6fd92d08 -s ours
am skip reason: Change-Id I2d982e8abb5cb6b4c74a20483550b18cf814320d with SHA-1 5a916810c6 is in history

Change-Id: Iac4c0a4c7d56693fe3505336c007565ac3ce76f8
2020-01-10 06:43:56 +00:00
Automerger Merge Worker
6e6fd92d08 Merge "Add keepalive related methods and fields to system APIs" am: 434bc5adf4 am: 57e9fd7e5a
Change-Id: Ie4cd12bb96a42f414d7026828e72eea16f4bd073
2020-01-10 06:31:54 +00:00
Aaron Huang
57e9fd7e5a Merge "Add keepalive related methods and fields to system APIs"
am: 434bc5adf4

Change-Id: Ic557c3ece7b443124ca050e6c6bfd3a1f2d77c3b
2020-01-09 22:20:39 -08:00
Aaron Huang
434bc5adf4 Merge "Add keepalive related methods and fields to system APIs" 2020-01-10 06:16:04 +00:00
Automerger Merge Worker
808d56c5dd [automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 0ebda2d6ca am: be4ef9fe6f -s ours am: d643f69d68 -s ours am: f13799cb24 -s ours am: c47be40b76 -s ours am: cfde6e371c -s ours
am skip reason: Change-Id I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4 with SHA-1 f988293d3c is in history

Change-Id: I4214af1569adfad7a376fe95fffc6127dcc3a223
2020-01-09 19:05:30 +00:00
Automerger Merge Worker
d9c06868b6 [automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev am: 361f1e97f6 -s ours am: b5933251bc -s ours am: 0135f92c89 -s ours am: e213703513 -s ours
am skip reason: Change-Id I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4 with SHA-1 f988293d3c is in history

Change-Id: I5b65a90ca11912a369680f58d82d22e381f110ca
2020-01-09 19:04:44 +00:00