Aaron Huang
1f5333e4e7
Merge "Make NattKeepalivePacketData @SystemApi"
...
am: d21ba54347
Change-Id: I6d212d1b830f29b8d8a77c727bfa23572f7e08a6
2020-01-14 07:03:31 -08:00
Aaron Huang
d21ba54347
Merge "Make NattKeepalivePacketData @SystemApi"
2020-01-14 14:36:09 +00:00
Lorenzo Colitti
837d7c87a9
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi"
...
am: 0699745a3d
Change-Id: I5b8def0055bb8f7062405b1f354c1edf6292a129
2020-01-13 22:04:13 -08:00
Lorenzo Colitti
0699745a3d
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi"
2020-01-14 05:30:14 +00:00
Chiachang Wang
8f50df2e87
Merge "Support reevaluation request from captive portal app"
...
am: 2d9623d86f
Change-Id: I5f376b4a342557b91b70d892308469b1fdda2363
2020-01-13 18:05:03 -08:00
paulhu
62af612113
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
2d9623d86f
Merge "Support reevaluation request from captive portal app"
2020-01-14 01:42:22 +00:00
Aaron Huang
5dcbfa87e1
Make NattKeepalivePacketData @SystemApi
...
Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
Change-Id: I687f1a8a4b82cb7e4a0dfeb24f0b23a4de6d5287
2020-01-14 01:45:28 +08:00
Junyu Lai
c91e66f3d1
Merge changes from topic "sp04"
...
am: 91c7daa454
Change-Id: Ib2b96e64074a575c4d1a682e34bf6682c2fe4830
2020-01-13 06:12:54 -08:00
junyulai
ca0bbc3437
[SP04] add unit test for NetworkStatsProvider
...
am: d6de56f3fb
Change-Id: Icd440ff9086604cb0baaa4cb3e8e458dcda3bb97
2020-01-13 06:12:48 -08:00
Junyu Lai
91c7daa454
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
d6de56f3fb
[SP04] add unit test for NetworkStatsProvider
...
Test: atest NetworkStatsServiceTest
Bug: 130855321
Change-Id: I0c19d8bedcb9398da3f464efe01e775fde9f8a78
2020-01-13 14:43:06 +08:00
Chiachang Wang
ef4a17d140
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
b65004fb39
Merge changes I7ea39b80,I6b9979f3
...
am: 310d1dac0d
Change-Id: I33b163077fcc270f79a11a43e481767934e8ac9e
2020-01-12 20:19:21 -08:00
Lorenzo Colitti
94c9314065
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
paulhu
21da34591b
Merge "Add NetworkCapabilities#deduceRestrictedCapability"
...
am: 39ac72436e
Change-Id: I3c451ed7725cacd5672e7b1920a0725239015e68
2020-01-10 01:32:25 -08:00
Treehugger Robot
39ac72436e
Merge "Add NetworkCapabilities#deduceRestrictedCapability"
2020-01-10 09:27:31 +00:00
Aaron Huang
1debddec2f
Merge "Expose DhcpInfo parcelable interface implementation methods"
...
am: 6510da5883
Change-Id: Ie432bee8641bd0c2e94adb04329ea6e80e8ed72c
2020-01-10 00:10:03 -08:00
Aaron Huang
6510da5883
Merge "Expose DhcpInfo parcelable interface implementation methods"
2020-01-10 08:05:24 +00:00
Aaron Huang
caa935af0c
Merge "Add keepalive related methods and fields to system APIs"
...
am: a4885a0b8e
Change-Id: Ic557c3ece7b443124ca050e6c6bfd3a1f2d77c3b
2020-01-09 22:20:39 -08:00
Aaron Huang
a4885a0b8e
Merge "Add keepalive related methods and fields to system APIs"
2020-01-10 06:16:04 +00:00
Lorenzo Colitti
f36cb1cf82
Merge "Add a NetworkProvider class to the SDK."
...
am: e026356956
Change-Id: If92b0d0e5644f66db3dd17f6b11ff937232c2a90
2020-01-09 07:13:16 -08:00
Lorenzo Colitti
e026356956
Merge "Add a NetworkProvider class to the SDK."
2020-01-09 15:09:58 +00:00
Aaron Huang
a397c7e03a
Expose DhcpInfo parcelable interface implementation methods
...
Parcelable class requires a CREATOR field be exposed.
Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
atest android.net.cts
Change-Id: I41c68406d09014dda99f337add8c0db0298b0582
2020-01-09 21:33:22 +08:00
Lorenzo Colitti
92e6c27592
Add a NetworkProvider class to the SDK.
...
Bug: 138306002
Test: builds, boots, wifi and telephony work
Test: tested by upcoming change that uses this in NetworkFactory
Change-Id: I2f61bf323215b7c6feff8acc92e7434346751773
2020-01-09 19:50:26 +09:00
paulhu
a189a352b8
Add NetworkCapabilities#deduceRestrictedCapability
...
Support telephony mainline module usage.
Bug: 138306002
Test: atest FrameworksNetTests
atest CtsNetTestCases --instant
Change-Id: Idbd9c547eff7227085c753461b901c7cdbe396fb
2020-01-09 17:59:46 +08:00
Junyu Lai
08ad8528d7
Merge "[SP01] Add NetworkStats to system API"
...
am: 0104ecc3b8
Change-Id: Ie9e97a16bbe221f42cff73bba59e9fc8404db551
2020-01-09 01:01:49 -08:00
Junyu Lai
0104ecc3b8
Merge "[SP01] Add NetworkStats to system API"
2020-01-09 08:33:24 +00:00
Mark Chien
e6029da66e
Merge "Replace ConnectivityManager constants to TetheringManager"
...
am: 477f778f0b
Change-Id: I7994991ac24f4e3ce753e55976b4b5e70b31539f
2020-01-08 22:36:55 -08:00
Mark Chien
477f778f0b
Merge "Replace ConnectivityManager constants to TetheringManager"
2020-01-09 06:32:04 +00:00
Chiachang Wang
d7a0be5096
Merge changes I6260695b,I88f00ca4
...
am: db9335b832
Change-Id: I550cb7e14d6c9f21a3d87073bcf692e387857cba
2020-01-08 20:03:33 -08:00
junyulai
18c92ac796
[SP01] Add NetworkStats to system API
...
In order to let external module report their network stats,
expose necessary APIs to construct NetworkStats object.
Test: atest FrameworksNetTests CtsUsageStatsTestCases
Test: m doc-comment-check-docs
Bug: 130855321
Change-Id: Id3ec8aaff3df67948c25eac2319a74cf33a27979
2020-01-09 03:11:22 +00:00
Chiachang Wang
a935ddf1f0
Expose clearCapabilities for mainline module
...
Support telephony mainline module usage.
Bug: 138306002
Test: Build and make api-stubs-docs-update-current-api
Change-Id: I6260695b01ec06244d2822f9438a7fae83539ff2
Merged-In: I0a462da4e87cae2c7d4a9b9a92de061a086c5752
2020-01-09 10:25:03 +08:00
Lorenzo Colitti
1d5f9da2ba
Merge "Refactor NetworkFactoryInfo to hide implementation details."
...
am: b3fc88fe67
Change-Id: Ide91a79a0d817efe408b9f85860178c9975a63bd
2020-01-08 16:19:27 -08:00
Lorenzo Colitti
b3fc88fe67
Merge "Refactor NetworkFactoryInfo to hide implementation details."
2020-01-09 00:10:47 +00:00
Cody Kesting
b37d6383db
Merge "Add API surface for ConnectivityDiagnostics API."
...
am: 4fa27babe0
Change-Id: I1661e0c1f73a2081ac19e6cca2b1128d4917de90
2020-01-08 14:03:24 -08:00
Cody Kesting
4fa27babe0
Merge "Add API surface for ConnectivityDiagnostics API."
2020-01-08 21:53:14 +00:00
Xin Li
e35d6b8a36
Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
...
am: 50c2cb0d6a
Change-Id: I4d10705027866ea946f5529166dd6f67aec9e332
2020-01-08 09:57:42 -08:00
Xin Li
50c2cb0d6a
Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
2020-01-08 17:39:17 +00:00
Artur Satayev
f1ac144432
Merge "Use new UnsupportedAppUsage annotation."
...
am: 9395887931
Change-Id: If7c0987b098608972ea743649561f5b803ea8d3c
2020-01-08 08:55:00 -08:00
markchien
1f5237045a
Replace ConnectivityManager constants to TetheringManager
...
Replace some ConnectivityManager constants as TetheringManager inside
tethering module. No API change, will have follow up CL to delete
@hide tethering constants in ConnectivityManager and replace caller
to using TetheringManager.
Bug: 144753389
Test: build
Change-Id: Ia1b963669722c32d147375763205ed2f3af52fed
2020-01-08 15:06:09 +00:00
Lorenzo Colitti
a54a1aa47e
Refactor NetworkFactoryInfo to hide implementation details.
...
This is in preparation for introducing NetworkProvider, which
will initially share ConnectivityService code with NetworkFactory.
Bug: 138306002
Test: atest FrameworksNetTests
Change-Id: Ic6f888621f473342ee3fe8fedf9411552111342b
2020-01-08 23:40:42 +09:00
Artur Satayev
0e45d789c1
Use new UnsupportedAppUsage annotation.
...
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.
Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
Merged-In: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
2020-01-08 14:04:40 +00:00
Remi NGUYEN VAN
81a121d5b5
Merge "Add FrameworksNetIntegrationTests to postsubmit"
...
am: 062a4df489
Change-Id: I3384970a0a961dfaaf10229ed9e5d39c4f552256
2020-01-07 05:05:45 -08:00
Remi NGUYEN VAN
062a4df489
Merge "Add FrameworksNetIntegrationTests to postsubmit"
2020-01-07 12:16:34 +00:00
markchien
ec2f2397ff
Merge "Change tetheroffloadjni to tetheringutilsjni"
...
am: c21a9bcc0e
Change-Id: I48207d95cf6f512ec038fb5dc9ba4009c01d676d
2020-01-07 01:12:30 -08:00
Treehugger Robot
c21a9bcc0e
Merge "Change tetheroffloadjni to tetheringutilsjni"
2020-01-07 09:05:43 +00:00
markchien
697fca5c4d
Change tetheroffloadjni to tetheringutilsjni
...
Rename tetheroffloadjni to tetheringutilsjni and move setupRaSocket
jni method from NetUtils into tetheringutilsjni.
Bug: 143195885
Test: -build, flash, boot
-atest TetheringTests
-Off/On hotspot with ipv6 upstream
Change-Id: Ib68eb6999bbe2d3ca97e68712f22b105311ef800
2020-01-07 07:42:13 +00:00
Lorenzo Colitti
6df702d3c9
Merge changes If28f0be6,If0f80067
...
am: 96529ad7fc
Change-Id: I108d3c36ce11af544ccfed9291dc38c690724915
2020-01-06 23:03:04 -08:00
Lorenzo Colitti
b32fb84a4b
Make LinkPropertiesTest pass, and fix an NPE.
...
aosp/973686 added the DHCP server address to LinkProperties, but
it did not have any tests, and would throw NPE when parceling a
LinkProperties that did not have a DHCP server.
Add tests and fix the bug.
Bug: 134098566
Test: unit test now passes
Change-Id: If28f0be650963e8d9af7eb53f6940824582a2db3
2020-01-07 13:02:32 +09:00