Commit Graph

8029 Commits

Author SHA1 Message Date
Automerger Merge Worker
893301ab1e [SP21] Address comments for API council review about aosp/1172143 am: f8660076c0
Change-Id: I8634d6f6ed65ec6b10009a90b147881fe1fc4530
2020-03-16 03:03:51 +00:00
Automerger Merge Worker
4d7a85bd6f Merge "Resolve ambiguous argument." am: 947aa6c65d
Change-Id: I4c03bb6d16127929f4d60aa071aee18e8ac4c669
2020-03-14 03:52:51 +00:00
Chalard Jean
947aa6c65d Merge "Resolve ambiguous argument." 2020-03-14 03:38:01 +00:00
Automerger Merge Worker
5afb008614 Merge "Update Javadoc comments for ConnectivityDiagnostics constants." am: 082ec1d459
Change-Id: I279519ca5013c4109dee9f6860852d9b3a70776a
2020-03-13 19:34:01 +00:00
Cody Kesting
082ec1d459 Merge "Update Javadoc comments for ConnectivityDiagnostics constants." 2020-03-13 19:09:18 +00:00
Chalard Jean
e82646b858 Resolve ambiguous argument.
CTS tests don't have access to TestNetworkAgent and therefore
require overloading this method, which means 'null' is ambiguous.

Bug: 139268426
Test: FrameworksNetTests
Change-Id: I9279718bde30bd98eff901921fb3411d22da72e5
2020-03-13 21:17:33 +09:00
Automerger Merge Worker
774f58e0c7 Merge "Remove redundant connected notification" am: 76c9cf8ae4
Change-Id: I7e52f81e6b1d98480f9c851d861fa00a98729c6c
2020-03-13 07:30:45 +00:00
Treehugger Robot
76c9cf8ae4 Merge "Remove redundant connected notification" 2020-03-13 07:10:13 +00:00
Automerger Merge Worker
506cde0b44 Merge "Add test for NetworkAgentConfig" am: 63ca656a6f
Change-Id: I00936490e096c54cebc408a899a18c1dbf9e93ea
2020-03-13 04:32:04 +00:00
Aaron Huang
63ca656a6f Merge "Add test for NetworkAgentConfig" 2020-03-13 04:13:04 +00:00
junyulai
f8660076c0 [SP21] Address comments for API council review about aosp/1172143
Test: atest FrameworksNetTests ImsPhoneCallTrackerTest
Test: atest TetheringTests NetworkStackTests
Test: m doc-comment-check-docs
Fix: 148552904

Change-Id: I141393f229e772d2eb9f7c156849e379bd71b845
2020-03-12 21:34:17 +08:00
Automerger Merge Worker
c1fb643492 Merge "Add javadoc for Network#netId" am: 12e8b300b0
Change-Id: Ie59644d3f581b17856625409112eb5c5bd8d2aa4
2020-03-12 10:16:29 +00:00
Mark Chien
12e8b300b0 Merge "Add javadoc for Network#netId" 2020-03-12 09:55:18 +00:00
markchien
6c65c01b1a Add javadoc for Network#netId
Bug: 151156820
Test: m doc-comment-check-docs
Change-Id: Iea34a5c58a8b77c83258a39a8a44601e21a482f5
2020-03-12 09:54:44 +00:00
Automerger Merge Worker
387bf88d47 Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" am: 07fb93026d
Change-Id: Ieb04ad8b9d0d36840d61cf10585672deb797c911
2020-03-11 10:25:04 +00:00
Paul Hu
07fb93026d Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" 2020-03-11 09:50:26 +00:00
paulhu
48dc409d46 Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])
Bug: 149426063
Bug: 150640362
Test: atest CtsNetTestCasesLatestSdk:android.net.util.SocketUtilsTest
      on both Q and R devices
Change-Id: I4b5a3dfb78b404d414b7dc358e6f16c3414a8b33
2020-03-11 15:20:26 +08:00
Automerger Merge Worker
483cdb87ed [automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 5d427c44da -s ours
am skip reason: Change-Id Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c with SHA-1 21286d2018 is in history

Change-Id: I88ef318934572883b59615bd6a1644a5f658842b
2020-03-11 04:35:01 +00:00
Aaron Huang
5d427c44da Merge "Remove framework code that has moved to frameworks/libs/net" 2020-03-11 04:22:09 +00:00
Aaron Huang
1feaacee76 Add test for NetworkAgentConfig
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
Change-Id: If9158d086bacb0ade94d59898ac223e4c8f4f73a
2020-03-10 21:01:14 +08:00
Automerger Merge Worker
b6285e1f6a Merge "Skip Route tests that are R-specific on Q" am: 4f95e6c696
Change-Id: I385fb495bacc26e1959492c53d063409a4e7bf02
2020-03-10 10:28:15 +00:00
Chiachang Wang
4f95e6c696 Merge "Skip Route tests that are R-specific on Q" 2020-03-10 10:24:48 +00:00
Chiachang Wang
e32fd54cfd Skip Route tests that are R-specific on Q
MTU was added in R so test for it should be run on Q. Also
revise test to adopt rule.

Test: atest CtsNetTestCasesLatestSdk:android.net.LinkAddressTest
      on both devices
Bug: 150918852
Change-Id: Ibab9cfae0d35b26c6e4ca0defbb89769b04201d4
2020-03-10 10:24:38 +00:00
Aaron Huang
2a21ea79ab 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
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ia5692aade490fbc8a037186fcdfc453e0dd8045b
Merged-In: Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c
2020-03-10 06:45:16 +00:00
Automerger Merge Worker
21286d2018 Merge "Add test for getDeprecationTime and getExpirationTime" am: b1bd6a47e4
Change-Id: Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c
2020-03-10 04:09:18 +00:00
Chiachang Wang
b1bd6a47e4 Merge "Add test for getDeprecationTime and getExpirationTime" 2020-03-10 03:40:55 +00:00
Automerger Merge Worker
4a6123e57b Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." am: 52f8ad3e37
Change-Id: I1336262b19aaa729fb07410eb9aeeb7869f2f88f
2020-03-09 19:59:18 +00:00
Cody Kesting
52f8ad3e37 Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." 2020-03-09 15:12:51 +00:00
Chiachang Wang
aae21605af Add test for getDeprecationTime and getExpirationTime
Add for cts coverage for system API

Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk:android.net.LinkAddressTest
Change-Id: I64cd2c914f2da71383af7cdef2cf64c60a7d268c
2020-03-09 06:59:50 +00:00
Automerger Merge Worker
48f016f1d9 Merge "Ignore NetworkAgentConfigTest on Q" am: 45f4fba01a
Change-Id: I4626672d2e5e96c7f249f34850f490199d82b06c
2020-03-09 05:12:17 +00:00
Automerger Merge Worker
b9d860e45a Merge "Skip LinkAddress tests that are R-specific on Q" am: a7b26b034a
Change-Id: I9221f3dbe00d9994b73c973cb61a59da7d32b0ac
2020-03-09 05:12:00 +00:00
Automerger Merge Worker
1db2dd223e Merge "Ignore testReevaluateNetwork until Q" am: 27e5d881fc
Change-Id: I0c8c1ecba97100efc49c2ec776af83a60160bd44
2020-03-09 05:11:40 +00:00
Remi NGUYEN VAN
45f4fba01a Merge "Ignore NetworkAgentConfigTest on Q" 2020-03-09 05:03:20 +00:00
Remi NGUYEN VAN
a7b26b034a Merge "Skip LinkAddress tests that are R-specific on Q" 2020-03-09 05:00:33 +00:00
Remi NGUYEN VAN
27e5d881fc Merge "Ignore testReevaluateNetwork until Q" 2020-03-09 05:00:12 +00:00
Remi NGUYEN VAN
bcef708445 Ignore NetworkAgentConfigTest on Q
NetworkAgentConfig did not exist on Q.

Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
          on Q and R devices
Bug: 150918852
Change-Id: I5414d7767c39327ff41673ff13ccd34982e10742
2020-03-09 12:04:39 +09:00
Remi NGUYEN VAN
6b54308152 Skip LinkAddress tests that are R-specific on Q
Address lifetime was added in R so tests for it should not be run on Q.

Test: CtsNetTestCasesLatestSdk:android.net.LinkAddressTest on both
          devices
Bug: 150918852
Change-Id: I98b14727eabcf569829eee8df34afc057eba6f93
2020-03-09 10:42:53 +09:00
Automerger Merge Worker
68ae9e8944 Merge "Remove the NetworkScore class." am: b9378258ff
Change-Id: Ieb78467dac3aca48eea9d049b83a74f9ff41eec7
2020-03-08 05:11:03 +00:00
Treehugger Robot
b9378258ff Merge "Remove the NetworkScore class." 2020-03-08 04:52:26 +00:00
Cody Kesting
950f4effa6 Update Javadoc comments for ConnectivityDiagnostics constants.
API Council feedback requested adding documentation for detection method
constants used in DataStallReport to indicate how the Data Stall was
detected.

Bug: 150598997
Test: n/a
Change-Id: Ib08f05562dd4b17973eeee97452d9f56d37e80fe
2020-03-06 08:05:06 -08:00
Remi NGUYEN VAN
8966d31126 Ignore testReevaluateNetwork until Q
The method did not exist until Q, so the test is not relevant on such
devices.

Test: atest CtsNetTestCasesLatestSdk:android.net.CaptivePortalTest on Q
          and R devices
Bug: 150918852
Change-Id: I913b6eaa61bfd4f1964b324dcb4dd272aa8cc583
2020-03-06 18:21:45 +09:00
Aaron Huang
1f4bfd624c Merge "Remove framework code that has moved to frameworks/libs/net" into stage-aosp-master 2020-03-06 05:53:20 +00:00
Chalard Jean
de41981736 Remove the NetworkScore class.
This class is useless at this point and introduces overhead.

Bug: 113554781
Test: FrameworksNetTests
Change-Id: Ib6da6c1c7f2a0b97c847d2e64e5ce16dd821e1e7
2020-03-06 11:57:53 +09:00
Amos Bianchi
ca0b6c5205 Merge "Remove polling of TetheringManager in ConnectivityManager." 2020-03-05 18:34:59 +00:00
Amos Bianchi
ddadca41a9 Remove polling of TetheringManager in ConnectivityManager.
Test: manual

Bug: 144742179

Change-Id: I196b320788be96c120f771d2fcdf032a73e26b5f
2020-03-05 18:34:14 +00:00
Bill Yi
04373073c6 Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" 2020-03-05 18:27:30 +00:00
lucaslin
5cba314789 Remove redundant connected notification
Remove the old connected notification since there is a new file
- NetworkStackNotifier.java which will send the connected
notification when captive portal validated.

Bug: 149883761
Test: 1. atest FrameworksNetTests
      2. Sign-in a captive portal and see if there is a redundant
      connected notification.

Change-Id: I4ec9d26623af4bfc65156a28a96b982466aede31
Merged-In: Id11a9b99dd04772a92af8d527104906c47bf64cd
2020-03-05 06:48:48 +00:00
Aaron Huang
d2db22ddaf 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
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I44e0a8361637c2d43be2e5d033d405b22e1a149c
Merged-In: I067cdc404e5a63947c19cb75069a39ae42faa3c8
Merged-In: Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef
2020-03-05 13:53:39 +08:00
Cody Kesting
2abe611e5b Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics.
ConnectivityDiagnostics shares NetworkCapabilities in
ConnectivityReports and DataStallReports. These NetworkCapabilities need
to have their UIDs scrubbed before they are shared with callbacks.

Bug: 148942124
Test: atest FrameworksNetTests
Change-Id: I5bde5a8116f7e36b8f4de49adf4cab8ec45a5aa4
2020-03-04 08:40:11 -08:00
Automerger Merge Worker
fffaf84a2b Merge changes I794a24d0,Iab32b2db am: fb8591f9d7
Change-Id: I03f6b9e521793b92f83a21583a2e53fb1d31fba1
2020-03-04 13:26:51 +00:00