Commit Graph

8872 Commits

Author SHA1 Message Date
Automerger Merge Worker
4ac7ae7348 [automerger skipped] Merge "Removing some of the API don't have to be @SystemApi" am: c4d6a4f566 am: 86ba38a5ba -s ours am: 8df9d88504 -s ours
am skip reason: Change-Id Ie30efa172f93a7557fb6ef56f4daf80e958c3787 with SHA-1 e93348f00d is in history

Change-Id: If68a189510466e69f18b591ccba94decc73432ac
2020-03-17 13:29:31 +00:00
Automerger Merge Worker
8df9d88504 [automerger skipped] Merge "Removing some of the API don't have to be @SystemApi" am: c4d6a4f566 am: 86ba38a5ba -s ours
am skip reason: Change-Id Ie30efa172f93a7557fb6ef56f4daf80e958c3787 with SHA-1 e93348f00d is in history

Change-Id: I3f81a90e806947d60fb8fe4f4856491284a43ed0
2020-03-17 13:15:17 +00:00
Automerger Merge Worker
86ba38a5ba Merge "Removing some of the API don't have to be @SystemApi" am: c4d6a4f566
Change-Id: I6687ba646982ea924feae7d8da6732a04184321e
2020-03-17 13:04:11 +00:00
Treehugger Robot
c4d6a4f566 Merge "Removing some of the API don't have to be @SystemApi" 2020-03-17 12:51:25 +00:00
Automerger Merge Worker
6667dbb0af Merge changes I97015365,Ic9db4b9b am: d080a4a32d am: 1c25e4ff44 am: ba33556f86
Change-Id: I275a8e2b66d1b3bac9eaf46f84f941fd7008156d
2020-03-17 10:28:54 +00:00
Automerger Merge Worker
ba33556f86 Merge changes I97015365,Ic9db4b9b am: d080a4a32d am: 1c25e4ff44
Change-Id: I058fcb4d7dac3ef384c3ccbe5a2cc880c6aed2a3
2020-03-17 10:16:15 +00:00
Automerger Merge Worker
1c25e4ff44 Merge changes I97015365,Ic9db4b9b am: d080a4a32d
Change-Id: Ic99385f58c7a0ee246d7dfeb12eb1723fda65c4b
2020-03-17 09:54:53 +00:00
Automerger Merge Worker
4bd3e6dacb [automerger skipped] Merge "services.net: Add a static library needed by wifi module" am: a0f5e8f3c2 am: 5cc4a63246 -s ours am: 56ccf539c3 -s ours
am skip reason: Change-Id Ifde69b579cfe5b813766f676acb10e436e64a44c with SHA-1 7cf9cb25e3 is in history

Change-Id: I7282fcc56290c105d7f3f03320503d53d31493fa
2020-03-17 09:39:06 +00:00
Automerger Merge Worker
349bfe3f32 [automerger skipped] Merge "services.net: Use the new ModuleNetworkStackClient" am: bcd6edb9d6 am: 8ad449dff9 -s ours am: 8d5189d6fb -s ours
am skip reason: Change-Id I065525fdbd64b9509ef0f47bb35954d267c65fd2 with SHA-1 1ce72ca363 is in history

Change-Id: I12824ac7895c44825aa0c64e972eff7ece8ee877
2020-03-17 09:38:53 +00:00
Chiachang Wang
d080a4a32d Merge changes I97015365,Ic9db4b9b
* changes:
  Add NattKeepalivePacketDataTest
  Add KeepalivePacketDataTest
2020-03-17 09:38:41 +00:00
Automerger Merge Worker
ad7dad2742 [automerger skipped] Merge "Add test for NetworkAgentConfig" into rvc-dev am: b8f5f43f67 -s ours am: 2966ce4bee -s ours
am skip reason: Change-Id If9158d086bacb0ade94d59898ac223e4c8f4f73a with SHA-1 1feaacee76 is in history

Change-Id: I5b0eeb4c0ca0bfe389b2bf427cfcbf8a4d27e498
2020-03-17 09:36:15 +00:00
Automerger Merge Worker
56ccf539c3 [automerger skipped] Merge "services.net: Add a static library needed by wifi module" am: a0f5e8f3c2 am: 5cc4a63246 -s ours
am skip reason: Change-Id Ifde69b579cfe5b813766f676acb10e436e64a44c with SHA-1 7cf9cb25e3 is in history

Change-Id: Ia476746bb37fee381245f49a801bf9abb32ba04d
2020-03-17 09:35:52 +00:00
Automerger Merge Worker
8d5189d6fb [automerger skipped] Merge "services.net: Use the new ModuleNetworkStackClient" am: bcd6edb9d6 am: 8ad449dff9 -s ours
am skip reason: Change-Id I065525fdbd64b9509ef0f47bb35954d267c65fd2 with SHA-1 1ce72ca363 is in history

Change-Id: I25e57f7208899f370a5131daa271dbf40ffcbe49
2020-03-17 09:35:40 +00:00
Automerger Merge Worker
41d452c5f0 [automerger skipped] Merge "Add test for NetworkAgentConfig" into rvc-dev am: b8f5f43f67 am: 10e6b23cab -s ours
am skip reason: Change-Id If9158d086bacb0ade94d59898ac223e4c8f4f73a with SHA-1 1feaacee76 is in history

Change-Id: I1a4f01ab2ab09a5348667f5e165be1f141f62944
2020-03-17 09:35:33 +00:00
Automerger Merge Worker
5cc4a63246 Merge "services.net: Add a static library needed by wifi module" am: a0f5e8f3c2
Change-Id: I9088ccdec461145b16597d50834d231c9ea771d5
2020-03-17 09:28:23 +00:00
Automerger Merge Worker
8ad449dff9 Merge "services.net: Use the new ModuleNetworkStackClient" am: bcd6edb9d6
Change-Id: I97918b59b98a76267935680ceae19881f5f42e7b
2020-03-17 09:27:07 +00:00
Treehugger Robot
a0f5e8f3c2 Merge "services.net: Add a static library needed by wifi module" 2020-03-17 09:22:12 +00:00
Remi NGUYEN VAN
bcd6edb9d6 Merge "services.net: Use the new ModuleNetworkStackClient" 2020-03-17 09:21:40 +00:00
Automerger Merge Worker
2966ce4bee [automerger skipped] Merge "Add test for NetworkAgentConfig" into rvc-dev am: b8f5f43f67 -s ours
am skip reason: Change-Id If9158d086bacb0ade94d59898ac223e4c8f4f73a with SHA-1 1feaacee76 is in history

Change-Id: I28afe6a88dc5972527f1f2949062813ca83295c6
2020-03-17 09:16:01 +00:00
Automerger Merge Worker
10e6b23cab Merge "Add test for NetworkAgentConfig" into rvc-dev am: b8f5f43f67
Change-Id: I5eef2519e160c98408951da8a33d089db09b7ceb
2020-03-17 09:15:46 +00:00
TreeHugger Robot
b8f5f43f67 Merge "Add test for NetworkAgentConfig" into rvc-dev 2020-03-17 09:00:38 +00:00
Automerger Merge Worker
a97418446e Add test for NetworkAgentConfig
Bug: 139268426
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
Change-Id: If9158d086bacb0ade94d59898ac223e4c8f4f73a
Merged-In: If9158d086bacb0ade94d59898ac223e4c8f4f73a
(cherry picked from aosp/1253722)
2020-03-17 08:44:38 +00:00
Automerger Merge Worker
7d617c0cd4 Merge "Move sensitive field parceling bool to constructor" am: 9e2a0cb322 am: 82280b8bb9 am: 91a66f29ac
Change-Id: Ida9f0505957c3bab1657f873699af26ab93f261c
2020-03-17 08:43:13 +00:00
Automerger Merge Worker
91a66f29ac Merge "Move sensitive field parceling bool to constructor" am: 9e2a0cb322 am: 82280b8bb9
Change-Id: Ice332671a4b97dad595c79c8c42ce47dca52b8e2
2020-03-17 08:17:51 +00:00
Automerger Merge Worker
82280b8bb9 Merge "Move sensitive field parceling bool to constructor" am: 9e2a0cb322
Change-Id: Ib5619a2173d838e81091415fe6323370f61c9461
2020-03-17 08:05:40 +00:00
Remi NGUYEN VAN
9e2a0cb322 Merge "Move sensitive field parceling bool to constructor" 2020-03-17 07:49:38 +00:00
Chiachang Wang
fd007f01ef Add NattKeepalivePacketDataTest
Add test for constructor and parcel

Test: atest CtsNetTestCasesLatestSdk:android.net.NattKeepalivePacketDataTest
      on both Q and R devices
Bug: 151402211
Change-Id: I97015365604be1846e3ecbaf60ac99e334705565
2020-03-17 15:48:02 +08:00
Chiachang Wang
13c97ebd73 Add KeepalivePacketDataTest
Add test for constructor of KeepalivePacketData and
InvalidPacketException

Bug: 151109466
Test: atest CtsNetTestCasesLatestSdk:android.net.KeepalivePacketDataTest
      on both Q and R devices
Change-Id: Ic9db4b9b83ff96c87f41c5f381763c3ee8dd27c8
2020-03-17 14:24:50 +08:00
Automerger Merge Worker
6f9b4cec6b [automerger skipped] Merge "Ensure that NetworkFactory objects cannot be reused." am: 3b2d608aa8 am: f95a726ac4 -s ours am: 6111724f31 -s ours
am skip reason: Change-Id I793436ee0f4b5d778788ad34b8a2575d2ad0ed80 with SHA-1 62fd0c1ab8 is in history

Change-Id: I4b833b93da3d868d28b362a78b54715176cf64c4
2020-03-17 05:31:36 +00:00
Automerger Merge Worker
6111724f31 [automerger skipped] Merge "Ensure that NetworkFactory objects cannot be reused." am: 3b2d608aa8 am: f95a726ac4 -s ours
am skip reason: Change-Id I793436ee0f4b5d778788ad34b8a2575d2ad0ed80 with SHA-1 62fd0c1ab8 is in history

Change-Id: I5672bf0133a8fa10a8d8332367d6a6fc046071e8
2020-03-17 05:19:06 +00:00
Automerger Merge Worker
f95a726ac4 Merge "Ensure that NetworkFactory objects cannot be reused." am: 3b2d608aa8
Change-Id: Ifc5cac306f1558c8560f1829eea538fe9a395b26
2020-03-17 04:55:06 +00:00
Lorenzo Colitti
3b2d608aa8 Merge "Ensure that NetworkFactory objects cannot be reused." 2020-03-17 04:35:01 +00:00
Automerger Merge Worker
0fe94dd038 Merge "Make LinkPropertiesTest backwards compatible" am: 167478a027 am: 5955798254 am: 40524fdcc6
Change-Id: I24304f2a22cf09300c0b5cccf2eaed1555aaef43
2020-03-17 03:07:22 +00:00
Automerger Merge Worker
40524fdcc6 Merge "Make LinkPropertiesTest backwards compatible" am: 167478a027 am: 5955798254
Change-Id: Ie1db141b72770490632c3974b904ee9b1438922e
2020-03-17 03:05:25 +00:00
Automerger Merge Worker
5955798254 Merge "Make LinkPropertiesTest backwards compatible" am: 167478a027
Change-Id: Iedcb704eba4a342058a7b6fdea3f1bd83dec4744
2020-03-17 02:48:05 +00:00
Remi NGUYEN VAN
c38954692a Move sensitive field parceling bool to constructor
This addresses API review comments recommending to use a copy
constructor with additional parameters instead of a dedicated method.
makeSensitiveFieldsParcelingCopy becomes LinkProperties(base, true).

Bug: 150877475
Test: atest FrameworksNetTests NetworkStackTests NetworkStackNextTests
Change-Id: Ib145ca7f36dcbee6ef47d09862a181fc04a28f03
2020-03-17 11:42:33 +09:00
Remi NGUYEN VAN
167478a027 Merge "Make LinkPropertiesTest backwards compatible" 2020-03-17 02:27:27 +00:00
Remi NGUYEN VAN
1d88c2e1a1 Make LinkPropertiesTest backwards compatible
LinkPropertiesTest must be backwards compatible with Q for CTS.

In Q 4 fields were added: DhcpServerAddress, WakeOnLanSupported,
CaptivePortalApiUrl, CaptivePortalData. The new test only tests these
fields on R and above.
testLinkPropertiesParcelable_Q still verifies that there are 14 fields
on Q, so the 4 extra fields can be ignored.

The changes use androidx.core.os.BuildCompat.isAtLeastR(), so
androidx.core_core is added as a dependency to FrameworksNetCommonTests.

Test: atest CtsNetTestCasesLatestSdk:android.net.LinkPropertiesTest
        on Q and R devices
Bug: 150918852
Change-Id: I570efa4eb483a717d4204a18473d02653a69f46d
2020-03-17 11:23:13 +09:00
Automerger Merge Worker
34b9bc5cfd Merge "Clean up unit testing for ConnectivityDiagnostics." am: 01f0a15807 am: d9d7d4666f am: 146c358e5a
Change-Id: I1364751dccc30051aaacf91ad09265d2efbec759
2020-03-16 20:12:32 +00:00
Automerger Merge Worker
146c358e5a Merge "Clean up unit testing for ConnectivityDiagnostics." am: 01f0a15807 am: d9d7d4666f
Change-Id: Idb2167c10f18e3d551a653483ba9ea344b872b87
2020-03-16 20:09:39 +00:00
Automerger Merge Worker
d9d7d4666f Merge "Clean up unit testing for ConnectivityDiagnostics." am: 01f0a15807
Change-Id: Idb4019968a3b3689f1aaddb5e59f3c609890104e
2020-03-16 19:52:06 +00:00
Cody Kesting
01f0a15807 Merge "Clean up unit testing for ConnectivityDiagnostics." 2020-03-16 19:33:33 +00:00
Automerger Merge Worker
3c415ee993 Merge "Add support for registering test networks with administrators." am: ed4de26836 am: 6fbb503d34 am: c865f84b76
Change-Id: I95ecd74a8c2462e00deb84a43260bcbe3d189a09
2020-03-16 18:43:18 +00:00
Automerger Merge Worker
c865f84b76 Merge "Add support for registering test networks with administrators." am: ed4de26836 am: 6fbb503d34
Change-Id: Ib10e5f0e1b564a4dd8e5ae0bd4032741dcd4e2bb
2020-03-16 18:32:43 +00:00
Automerger Merge Worker
6fbb503d34 Merge "Add support for registering test networks with administrators." am: ed4de26836
Change-Id: Ic6251b26fbbce029063d3f83c4fa6dbc4d01df40
2020-03-16 18:18:59 +00:00
Cody Kesting
ed4de26836 Merge "Add support for registering test networks with administrators." 2020-03-16 18:02:55 +00:00
Automerger Merge Worker
747fb87ef3 [automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 6e7c9fd3f1 am: f2fa6b6c23 -s ours am: 781ca6e569 -s ours
am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 04aca231be is in history

Change-Id: Icb70db29cdb11297ef40befa92f26aa4a076b571
2020-03-16 17:55:43 +00:00
Automerger Merge Worker
781ca6e569 [automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 6e7c9fd3f1 am: f2fa6b6c23 -s ours
am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 04aca231be is in history

Change-Id: I0186fe6a3dea5c9f955ea12e97c36d9f08b6ffac
2020-03-16 17:42:40 +00:00
Automerger Merge Worker
f2fa6b6c23 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 6e7c9fd3f1
Change-Id: Ibcfc11f90c8caa34954db73f668ca35a34c50e8d
2020-03-16 17:27:39 +00:00
Cody Kesting
6e7c9fd3f1 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" 2020-03-16 17:11:54 +00:00