Commit Graph

8913 Commits

Author SHA1 Message Date
Automerger Merge Worker
82f7da5284 Merge "Move sensitive field parceling bool to constructor" am: 9e2a0cb322 am: 82280b8bb9 am: 91a66f29ac am: 7d617c0cd4 am: 70db65d01c
Change-Id: Ia087e55b6a03623db5c2eee09ce1ebf8707e364c
2020-03-17 16:02:25 +00:00
Automerger Merge Worker
0de06c2a23 [automerger skipped] Merge "Ensure that NetworkFactory objects cannot be reused." am: 3b2d608aa8 am: f95a726ac4 -s ours am: 6111724f31 -s ours am: 6f9b4cec6b -s ours am: c2384b51a2 -s ours
am skip reason: Change-Id I793436ee0f4b5d778788ad34b8a2575d2ad0ed80 with SHA-1 62fd0c1ab8 is in history

Change-Id: Ia80519b477cb99c0c7c0e84e1c7b967570e9efce
2020-03-17 15:58:18 +00:00
Automerger Merge Worker
b4dafda742 Merge "Make LinkPropertiesTest backwards compatible" am: 167478a027 am: 5955798254 am: 40524fdcc6 am: 0fe94dd038 am: fb4714f3aa
Change-Id: I61db756128dede848a699f7af5ab535e98993603
2020-03-17 15:26:02 +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
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
36a1b8f6ed Merge "Clean up unit testing for ConnectivityDiagnostics." am: 01f0a15807 am: d9d7d4666f am: 146c358e5a am: 34b9bc5cfd am: 9be9976d33
Change-Id: I69470931ef09feb52025462eb4c66f2c1493bf14
2020-03-16 20:37:44 +00:00
Automerger Merge Worker
aea8c3f11a Merge "Add support for registering test networks with administrators." am: ed4de26836 am: 6fbb503d34 am: c865f84b76 am: 3c415ee993 am: c7919451d1
Change-Id: I67d943806cdc1a69172143766dadc634641b8c4d
2020-03-16 20:31:58 +00: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
ceaf5080e7 [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: 747fb87ef3 -s ours am: 96815b890a -s ours
am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 04aca231be is in history

Change-Id: I24d5aa01aa1c8715d44efb3e90019317e417dae1
2020-03-16 18:25:21 +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
Automerger Merge Worker
eb449592e2 Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev am: f7da86d448 am: d2a5f8e2e4 am: a2f3198127 am: 33be1d0d15
Change-Id: I744dc4dae9154a36323ae4740854e8f651095fe6
2020-03-16 17:06:46 +00:00
Automerger Merge Worker
0c3f10ca3a Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev am: f7da86d448 am: 940f298248 am: 862f520d22 am: 662e6e896c
Change-Id: I818157324ba9b22fe1dc51a6c0f6bc46efa374d5
2020-03-16 17:06:04 +00:00
Automerger Merge Worker
abd89b81af [automerger skipped] Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev am: bbc723d9ba -s ours am: 47417e1348 -s ours am: 21bcc4b11a -s ours am: 8ac2412f3b -s ours
am skip reason: Change-Id Ib08f05562dd4b17973eeee97452d9f56d37e80fe with SHA-1 ca0cbf817b is in history

Change-Id: Ie4fcb04486747d7775c432d043c3b806d052c031
2020-03-16 16:48:02 +00:00
Automerger Merge Worker
383f7ae9e6 [automerger skipped] Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev am: bbc723d9ba am: 44778f4e42 -s ours am: 28c49d1f2c -s ours am: 0ea25d2dfb -s ours
am skip reason: Change-Id Ib08f05562dd4b17973eeee97452d9f56d37e80fe with SHA-1 950f4effa6 is in history

Change-Id: Id536345bbfd01457f307fb29374a00c193fb5d81
2020-03-16 16:46:28 +00:00
Automerger Merge Worker
a2f3198127 Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev am: f7da86d448 am: d2a5f8e2e4
Change-Id: Icf0eaaf65f10c47cccfde84c9bd5e66aa27751ee
2020-03-16 16:40:32 +00:00
Automerger Merge Worker
862f520d22 Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev am: f7da86d448 am: 940f298248
Change-Id: I58e302b273bf15e6795ea84dc1f0f9dfb3bb3854
2020-03-16 16:40:00 +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
940f298248 Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev am: f7da86d448
Change-Id: Id010c4fb6386722666d979c973f26b9d4d0e6cdf
2020-03-16 16:27:57 +00:00
Automerger Merge Worker
d2a5f8e2e4 Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev am: f7da86d448
Change-Id: I8f54bd5dcbca8c1c0e4477209feebebfe2b4a6ea
2020-03-16 16:27:43 +00:00
TreeHugger Robot
f7da86d448 Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev 2020-03-16 16:23:23 +00:00
Automerger Merge Worker
21bcc4b11a [automerger skipped] Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev am: bbc723d9ba -s ours am: 47417e1348 -s ours
am skip reason: Change-Id Ib08f05562dd4b17973eeee97452d9f56d37e80fe with SHA-1 ca0cbf817b is in history

Change-Id: I7e6f49c7bd7052110c4ca1b738fb7562341b7788
2020-03-16 16:11:17 +00:00
Automerger Merge Worker
28c49d1f2c [automerger skipped] Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev am: bbc723d9ba am: 44778f4e42 -s ours
am skip reason: Change-Id Ib08f05562dd4b17973eeee97452d9f56d37e80fe with SHA-1 950f4effa6 is in history

Change-Id: I02a3b5437b52d1873a6d0507ba04e3b07aae143d
2020-03-16 16:10:14 +00:00
Automerger Merge Worker
44778f4e42 Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev am: bbc723d9ba
Change-Id: Icf694f44f543756e117e5eb18f0c46a15fa517ed
2020-03-16 15:56:46 +00:00
Automerger Merge Worker
47417e1348 [automerger skipped] Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev am: bbc723d9ba -s ours
am skip reason: Change-Id Ib08f05562dd4b17973eeee97452d9f56d37e80fe with SHA-1 950f4effa6 is in history

Change-Id: I7c764ef28caba3a515fca36f3fe0171d055aeae3
2020-03-16 15:56:09 +00:00
Automerger Merge Worker
b6230883cc Merge "Protect ConnectivityService from SecurityException in permission check." am: 4427f0d106 am: 64e66d2c0b am: 6f19d43a09 am: d661dfc1ea am: b2085a8ecf
Change-Id: I5cd9560ab3e0e7be0f85a4c2cd0ddc46a50e508e
2020-03-16 15:48:50 +00:00
Cody Kesting
bbc723d9ba Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev 2020-03-16 15:39:43 +00:00
Automerger Merge Worker
d661dfc1ea Merge "Protect ConnectivityService from SecurityException in permission check." am: 4427f0d106 am: 64e66d2c0b am: 6f19d43a09
Change-Id: I35c9c3c197f47be241a9a0839ee9bf8ac9b332df
2020-03-16 15:10:34 +00:00
Automerger Merge Worker
6f19d43a09 Merge "Protect ConnectivityService from SecurityException in permission check." am: 4427f0d106 am: 64e66d2c0b
Change-Id: Ia3bda6925daf06b762e6c926bea1b6ff4e640e58
2020-03-16 14:54:02 +00:00