Automerger Merge Worker
f26ffda5ec
[automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f am: cbc2ca4681 -s ours am: 98604b57c9 -s ours am: dec7470980 -s ours
...
am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 c5941bb7a3
2020-03-17 17:08:18 +00:00
Automerger Merge Worker
bf83d523d8
[automerger skipped] Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 6e0d458d63 am: 579c2bd4af -s ours am: 56848eadfe -s ours am: 253da1cd26 -s ours
...
am skip reason: Change-Id Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2 with SHA-1 5df8e985df
2020-03-17 17:08:03 +00:00
Automerger Merge Worker
d20a3f1a5e
Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311 am: 5bc1ba2198 am: e95e9bdfc4 am: 890d7de258
...
Change-Id: I2544415c46b659798e74b0f5fa476407fcd59313
2020-03-17 17:07:48 +00:00
Automerger Merge Worker
780aa9ae2d
Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311 am: ba4aecf53c am: 0d6fdd3098 am: 33a0734fe7
...
Change-Id: Ie7374784ccf523e6dcf28f207e9639405e82c220
2020-03-17 17:07:19 +00:00
Automerger Merge Worker
d7b1ed63fc
[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: 4ac7ae7348 -s ours am: b063f2422b -s ours
...
am skip reason: Change-Id Ie30efa172f93a7557fb6ef56f4daf80e958c3787 with SHA-1 e93348f00d
2020-03-17 16:53:28 +00:00
Automerger Merge Worker
08144aab6b
Merge changes I97015365,Ic9db4b9b am: d080a4a32d am: 1c25e4ff44 am: ba33556f86 am: 6667dbb0af am: 63a8145c91
...
Change-Id: I68172e245c2ac50e590903fb3d4664686202ea4c
2020-03-17 16:22:48 +00:00
Automerger Merge Worker
f54871310c
[automerger skipped] Merge "services.net: Add a static library needed by wifi module" am: a0f5e8f3c2 am: 5cc4a63246 -s ours am: 56ccf539c3 -s ours am: 4bd3e6dacb -s ours am: b2847be801 -s ours
...
am skip reason: Change-Id Ifde69b579cfe5b813766f676acb10e436e64a44c with SHA-1 7cf9cb25e3
2020-03-17 16:22:04 +00:00
Automerger Merge Worker
a6e7f64094
[automerger skipped] Merge "services.net: Use the new ModuleNetworkStackClient" am: bcd6edb9d6 am: 8ad449dff9 -s ours am: 8d5189d6fb -s ours am: 349bfe3f32 -s ours am: 6a8a3f4d16 -s ours
...
am skip reason: Change-Id I065525fdbd64b9509ef0f47bb35954d267c65fd2 with SHA-1 1ce72ca363
2020-03-17 16:21:40 +00:00
Automerger Merge Worker
62c5ab4e5d
[automerger skipped] Merge "Add test for NetworkAgentConfig" into rvc-dev am: b8f5f43f67 -s ours am: 2966ce4bee -s ours am: ad7dad2742 -s ours am: 340f0d0b52 -s ours
...
am skip reason: Change-Id If9158d086bacb0ade94d59898ac223e4c8f4f73a with SHA-1 a97418446e
2020-03-17 16:20:08 +00:00
Automerger Merge Worker
706556994a
[automerger skipped] Merge "Add test for NetworkAgentConfig" into rvc-dev am: b8f5f43f67 am: 10e6b23cab -s ours am: 41d452c5f0 -s ours am: ad869fb63f -s ours
...
am skip reason: Change-Id If9158d086bacb0ade94d59898ac223e4c8f4f73a with SHA-1 1feaacee76
2020-03-17 16:19:02 +00:00
Automerger Merge Worker
98604b57c9
[automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f am: cbc2ca4681 -s ours
...
am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 c5941bb7a3
2020-03-17 16:04:48 +00:00
Automerger Merge Worker
56848eadfe
[automerger skipped] Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 6e0d458d63 am: 579c2bd4af -s ours
...
am skip reason: Change-Id Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2 with SHA-1 5df8e985df
2020-03-17 16:04:32 +00:00
Automerger Merge Worker
e95e9bdfc4
Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311 am: 5bc1ba2198
...
Change-Id: Ia7a1ebbada866e5f6745ac2e19442f5138809f16
2020-03-17 16:04:13 +00:00
Automerger Merge Worker
0d6fdd3098
Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311 am: ba4aecf53c
...
Change-Id: I499ae9ec841be5be465cc8341f4385d857cc0168
2020-03-17 16:04:04 +00:00
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
2020-03-17 15:58:18 +00:00
Automerger Merge Worker
cbc2ca4681
Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f
...
Change-Id: Id6e807272dca79a2e02974a7e6985eb6e7515326
2020-03-17 15:49:07 +00:00
Automerger Merge Worker
579c2bd4af
Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 6e0d458d63
...
Change-Id: I5b44ff9afedcf40d82ba0c4666b2b16e72583383
2020-03-17 15:48:48 +00:00
Automerger Merge Worker
5bc1ba2198
Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311
...
Change-Id: I8c016464f6ba4b3237332bb2148183cb5d755ec4
2020-03-17 15:48:20 +00:00
Automerger Merge Worker
ba4aecf53c
Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311
...
Change-Id: I42c78c2626d1592bd5a0da215579f55bf04dc088
2020-03-17 15:48:00 +00:00
Cody Kesting
d95e6de42f
Merge "Add support for registering test networks with administrators." into rvc-dev
2020-03-17 15:31:26 +00:00
Cody Kesting
6e0d458d63
Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev
2020-03-17 15:31:06 +00:00
Cody Kesting
b0dc78e311
Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev
2020-03-17 15:29:55 +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
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
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
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
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
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
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
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
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
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
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
