Commit Graph

8194 Commits

Author SHA1 Message Date
Automerger Merge Worker
72d064bd41 Merge "Removing some of the API don't have to be @SystemApi" am: c4d6a4f566 am: 86ba38a5ba
Change-Id: I1ac545b986a0e43f2da5a9008243d8b1df3f8fc4
2020-03-17 13:15:23 +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
fdaf8a3cf4 Merge changes I97015365,Ic9db4b9b am: d080a4a32d am: 1c25e4ff44
Change-Id: I8e7ea75661fad300057239d99c106c55a6bdf54d
2020-03-17 10:15:53 +00:00
Automerger Merge Worker
1c25e4ff44 Merge changes I97015365,Ic9db4b9b am: d080a4a32d
Change-Id: Ic99385f58c7a0ee246d7dfeb12eb1723fda65c4b
2020-03-17 09:54: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
0db08f9bc4 Merge "services.net: Add a static library needed by wifi module" am: a0f5e8f3c2 am: 5cc4a63246
Change-Id: I87011f46dceed7cad38b2f858e5fdf39bba0d6a8
2020-03-17 09:35:35 +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
9a5217be31 Merge "services.net: Use the new ModuleNetworkStackClient" am: bcd6edb9d6 am: 8ad449dff9
Change-Id: Ia6826b1b4bd1079369ad19c8d6d73af53ad97049
2020-03-17 09:27:53 +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
15e0e69f10 Merge "Move sensitive field parceling bool to constructor" am: 9e2a0cb322 am: 82280b8bb9
Change-Id: Iaef82bcc36b9ad4ab515f62ab1e1ac4c9882808b
2020-03-17 08:17:33 +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
c51cad8a27 Merge "Ensure that NetworkFactory objects cannot be reused." am: 3b2d608aa8 am: f95a726ac4
Change-Id: Iaeb9dc97035848f9652dc57a89bfa1fd2c52dab2
2020-03-17 05:19:33 +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
93dab905b2 Merge "Make LinkPropertiesTest backwards compatible" am: 167478a027 am: 5955798254
Change-Id: Ic6cac60eb7ac3c343bafd5f582b56ee90594baff
2020-03-17 03:05:32 +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
669ec289d0 Merge "Clean up unit testing for ConnectivityDiagnostics." am: 01f0a15807 am: d9d7d4666f
Change-Id: Ia595e34aee38dd5fefeec5f2b065dd3395ccad46
2020-03-16 20:09:51 +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
ef0ae5e9a4 Merge "Add support for registering test networks with administrators." am: ed4de26836 am: 6fbb503d34
Change-Id: Ia50086e3871fcc5a3a0d904ad4ad2a742f3b5d6f
2020-03-16 18:32:55 +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
76a0e58cd2 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 6e7c9fd3f1 am: f2fa6b6c23
Change-Id: I4f4cc6289b598c5c2af24cc1b3d68dcc643c6d93
2020-03-16 17:42:52 +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
Lorenzo Colitti
86ae4716e4 Ensure that NetworkFactory objects cannot be reused.
NetworkFactory is turning into a one-time object that cannot be
re-used. Check for this in ConnectivityService.

Bug: 148635501
Test: test continues to pass
Change-Id: I793436ee0f4b5d778788ad34b8a2575d2ad0ed80
Merged-In: I793436ee0f4b5d778788ad34b8a2575d2ad0ed80
2020-03-17 01:39:23 +09:00
Automerger Merge Worker
88e1437f99 Merge "Protect ConnectivityService from SecurityException in permission check." am: 4427f0d106 am: 64e66d2c0b
Change-Id: I7027d7111aeed8ec5835c3dcf0ef5d24046d4b8b
2020-03-16 14:54:07 +00:00
Automerger Merge Worker
64e66d2c0b Merge "Protect ConnectivityService from SecurityException in permission check." am: 4427f0d106
Change-Id: I30d993e431b9d6486dcaebdc48c525a861301f70
2020-03-16 14:47:49 +00:00
Cody Kesting
4427f0d106 Merge "Protect ConnectivityService from SecurityException in permission check." 2020-03-16 14:33:25 +00:00
Automerger Merge Worker
6041e2b933 Merge changes I801ddc49,Id1b8f41b am: ba350f4652 am: eb5baeccd9
Change-Id: Ibc0b7c74ce55198fc6804b5cf1ea414aad912a4f
2020-03-16 11:56:19 +00:00
Automerger Merge Worker
eb5baeccd9 Merge changes I801ddc49,Id1b8f41b am: ba350f4652
Change-Id: I604bcfab22d7b26b84bf126d02d9be612fcb6d29
2020-03-16 11:41:19 +00:00
Aaron Huang
9e121dae3a Removing some of the API don't have to be @SystemApi
Some of the API we made @SystemApi won't be used by mainline
module. Removing these from the surface.

Bug: 151266974
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests
      atest FrameworksWifiTests

Change-Id: Ie30efa172f93a7557fb6ef56f4daf80e958c3787
Merged-In: Ie30efa172f93a7557fb6ef56f4daf80e958c3787
2020-03-16 17:39:41 +08:00
junyulai
2521ad7386 [SP24] Rename functions that add Entry unconditionally
Currently, in NetworkStats, there are many methods to manipulate
the records. However, some methods are similar and ambiguous,
such as addEntry, addValues, setValues, addIfaceValues,
combineValues and combineAllValues.

Thus, properly grouping and renaming methods are necessary.
In this change, for methods that add one record unconditionally,
name them insertEntry.
  setIfaceValues -> insertEntry
  addEntry -> insertEntry

Test: atest FrameworksNetTests ImsPhoneCallTrackerTest TetheringTests
Test: m doc-comment-check-docs
Bug: 148895143
Change-Id: I801ddc49e283a254b9586700c9b597c0adb0d459
2020-03-16 14:27:45 +08:00
Automerger Merge Worker
3d85fdcca2 Merge "[SP21] Address comments for API council review about aosp/1172143" am: cc8e8480b3 am: 36b22b0180
Change-Id: If460ba88094d078d48819d074678c5580ca65fc0
2020-03-16 03:14:17 +00:00
Automerger Merge Worker
6e2f632419 [SP21] Address comments for API council review about aosp/1172143 am: f8660076c0 am: 893301ab1e
Change-Id: Ia5e64eb524a852539850f46df87a6b28d4910cbc
2020-03-16 03:13:45 +00:00
Automerger Merge Worker
36b22b0180 Merge "[SP21] Address comments for API council review about aosp/1172143" am: cc8e8480b3
Change-Id: Ief866c87b9e69b892fca435e8555080ffdad4af7
2020-03-16 03:05:06 +00:00
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
Junyu Lai
cc8e8480b3 Merge "[SP21] Address comments for API council review about aosp/1172143" 2020-03-16 02:41:19 +00:00
Roshan Pius
9c259cd90a services.net: Add a static library needed by wifi module
Add a new static library that compiles against system_current which
includes all the parts needed by the wifi mainline module.

Also,
a) Refactored TcpKeepalivePacketData to use public APIs. The parcel
read/write methods in the base class are @hide and they're not used by
the other child class (NatKeepalivePacketData). So, remove the @hide
method from base class and use it direcly in the child class.

Bug: 145825329
Test: Device boots up & connects to wifi networks.
Change-Id: Ifde69b579cfe5b813766f676acb10e436e64a44c
Merged-In: Ifde69b579cfe5b813766f676acb10e436e64a44c
2020-03-16 00:23:42 +00:00
Automerger Merge Worker
7894645a17 Merge "Resolve ambiguous argument." am: 947aa6c65d am: 4d7a85bd6f
Change-Id: I32bca87c4453bd491611ce6c5d95da5b66e45aab
2020-03-14 04:13:49 +00:00
Automerger Merge Worker
4d7a85bd6f Merge "Resolve ambiguous argument." am: 947aa6c65d
Change-Id: I4c03bb6d16127929f4d60aa071aee18e8ac4c669
2020-03-14 03:52:51 +00:00