Commit Graph

3301 Commits

Author SHA1 Message Date
Xin Li
d5ef4dbdbf [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 0f12601ff3 -s ours am: 79d906ff81 -s ours am: ede550a504
am: d8cf850578 -s ours
am skip reason: subject contains skip directive

Change-Id: I4c220c4ce16694a153bbb17971dd461acb6e0157
2019-05-17 09:51:30 -07:00
Xin Li
d8cf850578 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 0f12601ff3 -s ours am: 79d906ff81 -s ours
am: ede550a504

Change-Id: I4f6bb23e9896a9100c9b31aa036c88271ce5745e
2019-05-16 22:39:56 -07:00
Xin Li
ede550a504 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 0f12601ff3 -s ours
am: 79d906ff81 -s ours
am skip reason: subject contains skip directive

Change-Id: I8d9b6b2fd99063662562208fe5e1cd7a3b7bae8f
2019-05-16 21:18:55 -07:00
Xin Li
91d9b93ebc Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: acd4822618 -s ours am: 5840687195
am: be9818746b -s ours
am skip reason: subject contains skip directive

Change-Id: I1a9fc0b81e27e0aa143a1c6e0ea81e96196ece43
2019-05-16 13:42:40 -07:00
Xin Li
ff12aba32b [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: acd4822618 -s ours am: a81e804393
am: 72f1581e89 -s ours
am skip reason: subject contains skip directive

Change-Id: I103b9bd04bd9126c8da9769fecafb20caac7e4d6
2019-05-16 10:13:26 -07:00
Benedict Wong
23ab30d68f Merge "Merge "Fix IPsec CTS tests for interface address checking" into qt-dev am: b256c48d9b am: 701f04f642" into qt-r1-dev-plus-aosp
am: e9c7cd9254

Change-Id: I6eba2fd8ce11a54dd8b7d1770be1e85e3e522e6d
2019-05-16 08:12:46 -07:00
Xin Li
be9818746b Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: acd4822618 -s ours
am: 5840687195

Change-Id: Iea90194c111ce5f14de10a0fa71945a0416d818d
2019-05-16 03:31:53 -07:00
Benedict Wong
0b8d449ec2 Merge "Fix IPsec CTS tests for interface address checking" into qt-dev am: b256c48d9b am: 8638f6bd88
am: de4f181e1a

Change-Id: I81ea3a4eb67961c56a68ced13aaec9675ac9a77c
2019-05-16 02:34:21 -07:00
Xin Li
72f1581e89 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: acd4822618 -s ours
am: a81e804393

Change-Id: Ic1b824193391dafaf2ea3996c89e2975829a3abc
2019-05-16 02:29:04 -07:00
Benedict Wong
d09d1dc280 [automerger skipped] Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev am: c7774ffa16 -s ours am: c7657003be -s ours
am: ced3090359 -s ours
am skip reason: change_id I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7 with SHA1 d2465991d9 is in history

Change-Id: I4aa807405215cf72914bb96c53da03af21dc331a
2019-05-16 01:42:50 -07:00
Junyu Lai
89165b1f20 [automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev am: 8702c1454d -s ours am: 9fe83529b8 -s ours
am: 33dd370165 -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 80ec50b8ae is in history

Change-Id: If89cdbe56a37a6e70ae4e29adb3f87ab86ee36c0
2019-05-16 00:47:13 -07:00
Android Build Merger (Role)
e9c7cd9254 Merge "Merge "Fix IPsec CTS tests for interface address checking" into qt-dev am: b256c48d9b am: 701f04f642" into qt-r1-dev-plus-aosp 2019-05-16 06:43:32 +00:00
Benedict Wong
53f9ca33f5 Merge "Fix IPsec CTS tests for interface address checking" into qt-dev am: b256c48d9b
am: 701f04f642

Change-Id: I9338241469f0c707817b04ed7f7a2769e149202a
2019-05-15 23:43:11 -07:00
Benedict Wong
de4f181e1a Merge "Fix IPsec CTS tests for interface address checking" into qt-dev am: b256c48d9b
am: 8638f6bd88

Change-Id: Ie09d1ec0a6c28f40a8898f0807dc8830c9f1df75
2019-05-15 22:11:32 -07:00
Benedict Wong
75d341a00c [automerger skipped] Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev am: c7774ffa16 -s ours
am: 9107d1254d -s ours
am skip reason: change_id I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7 with SHA1 d2465991d9 is in history

Change-Id: I2bbd2e1b17d3817e0cc428e611f067869ce468a1
2019-05-15 20:32:18 -07:00
Junyu Lai
95cdce29d4 [automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev am: 8702c1454d -s ours
am: 13ac5e1179 -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 bbf160a93d is in history

Change-Id: I05acf67444e52603cf72e1ba332b789688bec6d4
2019-05-15 19:42:14 -07:00
Android Build Merger (Role)
5840687195 Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: acd4822618 -s ours am skip reason: subject contains skip directive" into qt-dev-plus-aosp 2019-05-16 01:07:52 +00:00
Benedict Wong
ced3090359 [automerger skipped] Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev am: c7774ffa16 -s ours
am: c7657003be -s ours
am skip reason: change_id I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7 with SHA1 d2465991d9 is in history

Change-Id: If52d90532c3e66d3ac92f075b347f48f83728a0c
2019-05-15 18:06:39 -07:00
Benedict Wong
701f04f642 Merge "Fix IPsec CTS tests for interface address checking" into qt-dev
am: b256c48d9b

Change-Id: Id490a48213f8ef6b2da320f682a8b6bea0ee4a26
2019-05-15 17:30:22 -07:00
Xin Li
a81e804393 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
am: acd4822618 -s ours
am skip reason: subject contains skip directive

Change-Id: Iabeaf75a47849a45057b5be8e20b955bb112754b
2019-05-15 17:27:09 -07:00
Junyu Lai
33dd370165 [automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev am: 8702c1454d -s ours
am: 9fe83529b8 -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 bbf160a93d is in history

Change-Id: I2780d2e0e6abdeacd606e2c1da72f0534e9f7b5e
2019-05-15 17:25:06 -07:00
Xin Li
0f12601ff3 DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
Bug: 132622481
Change-Id: If0c7a9fe0a6f3b0abf65d60492c6b2d0a4ce8527
2019-05-15 16:55:12 -07:00
Benedict Wong
9107d1254d [automerger skipped] Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev
am: c7774ffa16 -s ours
am skip reason: change_id I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7 with SHA1 d2465991d9 is in history

Change-Id: I055e83cefe7fb9865688c6750d7f85f57ef125a4
2019-05-15 16:15:12 -07:00
Junyu Lai
13ac5e1179 [automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev
am: 8702c1454d -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 80ec50b8ae is in history

Change-Id: I8df6484c7872da7459437518451468e7d6cf24a2
2019-05-15 14:46:56 -07:00
Benedict Wong
4af108aacf Fix IPsec CTS tests for interface address checking
Fixes two potentially device/kernel specific, or flaky bugs:
1. Java interface checking by name seems to cache the lookup, resulting
in interface address checks occasionally failing (on delete).
2. Link-local addresses appear to be added on all links for some set of
kernels and devices.

This patch addresses both by only checking that the requested address
was added via a address-based NetworkInterface lookup.

Bug: 72950854
Test: Ran on sargo-eng on qt-dev/HEAD
Test: Manually verified that the addresses are indeed added/removed
Change-Id: I3babc72dfe72337c4d68facb1695aec15e504c90
2019-05-15 01:02:28 -07:00
Benedict Wong
82752ae2af [automerger skipped] Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev am: c7774ffa16 -s ours
am: c7657003be -s ours
am skip reason: change_id I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7 with SHA1 d2465991d9 is in history

Change-Id: I6177843de2b7cfa8e95543430a7c9f0a7fb84854
2019-05-14 22:30:31 -07:00
Benedict Wong
c7657003be [automerger skipped] Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev
am: c7774ffa16 -s ours
am skip reason: change_id I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7 with SHA1 d2465991d9 is in history

Change-Id: I990a35a69d0c5d10cb97e27668a831e2ca78bcc4
2019-05-14 21:42:35 -07:00
TreeHugger Robot
c7774ffa16 Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev 2019-05-15 03:58:29 +00:00
Junyu Lai
7bfd517419 [automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev am: 8702c1454d -s ours
am: 9fe83529b8 -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 80ec50b8ae is in history

Change-Id: Ie41cf36442cb8148844d8ab3ded4765f76bd2c14
2019-05-14 20:22:57 -07:00
Junyu Lai
9fe83529b8 [automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev
am: 8702c1454d -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 80ec50b8ae is in history

Change-Id: I34770e7d4fe3dcde9f8f41eeedee93053049b0bd
2019-05-14 19:32:45 -07:00
Xin Li
acd4822618 DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
Bug: 132622481
Change-Id: Idefc5f1ded84cc4621e3297b1f1e0894fd3bd9b3
2019-05-14 09:34:08 -07:00
Junyu Lai
8efd5f026b Merge changes I60b9e9ae,I8be89116 am: c3db303f0b am: 3fc54a07ae
am: 6bbc8f71af

Change-Id: I5be7d999607d81c7cc38445502085ca21e89773d
2019-05-13 07:30:06 -07:00
Junyu Lai
6bbc8f71af Merge changes I60b9e9ae,I8be89116 am: c3db303f0b
am: 3fc54a07ae

Change-Id: I7dbe2879e00bb9f7614ca700b40fb54e7e3f1744
2019-05-13 07:24:29 -07:00
Junyu Lai
3fc54a07ae Merge changes I60b9e9ae,I8be89116
am: c3db303f0b

Change-Id: I2b98b3083c33dfd7e9e4a204375433c116f84813
2019-05-13 07:19:21 -07:00
junyulai
bbf160a93d add cts for unprivileged keepalive slots
Currently, unprivileged Nat-T keepalives are limited to 1 slot
per uid. Add CTS to verify that the keepalive slots are limited
as customized for unprivileged requests.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveUnprivileged
      --generate-new-metrics 10

(Clean cherry-pick of aosp/957205)

Change-Id: I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b
Merged-In: I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b
2019-05-13 22:19:02 +08:00
junyulai
ad4c047f6d [KA14] add cts for keepalive limit test.
Per SDK requirement, OEM is required to support minimum number of
concurrent keepalives. Implement CTS to verify this.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveLimit
      --generate-new-metrics 10

(Clean cherry-pick of aosp/937026)

Change-Id: I8be89116bed5c4dedb2ca42b6d633aa9e8c6a49a
Merged-In: I8be89116bed5c4dedb2ca42b6d633aa9e8c6a49a
2019-05-13 22:16:50 +08:00
junyulai
80ec50b8ae add cts for unprivileged keepalive slots
Currently, unprivileged Nat-T keepalives are limited to 1 slot
per uid. Add CTS to verify that the keepalive slots are limited
as customized for unprivileged requests.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveUnprivileged
      --generate-new-metrics 10

Change-Id: I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b
2019-05-13 18:10:36 +08:00
junyulai
b41bc72ea3 [KA14] add cts for keepalive limit test.
Per SDK requirement, OEM is required to support minimum number of
concurrent keepalives. Implement CTS to verify this.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveLimit
      --generate-new-metrics 10

Change-Id: I8be89116bed5c4dedb2ca42b6d633aa9e8c6a49a
2019-05-13 18:10:23 +08:00
Benedict Wong
9e0263943f Merge "Convert IPsec tests to JUnit4" into qt-dev am: cb00fbdcc2
am: 236be238b6

Change-Id: I7a1b315b7d9c433ce996791fa64408f01aa75812
2019-05-11 01:49:04 -07:00
Benedict Wong
8929f6bfdd Merge "Enforce IPsec Tunnel mode for Android Q" am: 81e51bce50 am: ad380770a3
am: d2465991d9

Change-Id: Iad5cb4d5b6c83e0e2cda87e0f7ce0d69a52acd6d
2019-05-10 21:37:39 -07:00
Benedict Wong
ff0c1c3ff6 [automerger skipped] Merge changes Ic4181fc8,Icffeed2e,I9fdba4a9 into qt-dev am: e97231be1b -s ours
am: 305873fdd9 -s ours
am skip reason: change_id Ic4181fc857fa880db5553314efa914f870dbe87c with SHA1 64e64ff454 is in history

Change-Id: Iddcd115b723754be646ac7726b794f7433c11ca3
2019-05-10 21:33:52 -07:00
Benedict Wong
236be238b6 Merge "Convert IPsec tests to JUnit4" into qt-dev
am: cb00fbdcc2

Change-Id: I55b51901ecf1166bc553b247e0c9681fb1e20058
2019-05-10 15:52:14 -07:00
Benedict Wong
0d08e91fe7 Convert IPsec tests to JUnit4
This patch fixes an incompatibility where some tests in the same
hierarchy were using Junit3, and other Junit4

No functional test changes made

Bug: 72950854
Test: Ran on devices, working
Change-Id: I79d231e202ba25ad5f57b44b387bebd7f012aa95
2019-05-10 20:05:43 +00:00
Benedict Wong
fbbb9c9c04 Enforce IPsec Tunnel mode for Android Q
This commit adds a second condition to whether the device is expected to
have the tunnel mode feature. If a device's first API/launch version is
Q or above, require IPsec tunnels

Bug: 72950854
Test: Ran on device with first API level < Q and == Q.
Merged-In: I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7
Change-Id: I7b849ad24a04b6b7899a80f1856236b5ceb5a839
(cherry picked from commit d2465991d9)
2019-05-10 18:08:48 +00:00
Benedict Wong
d2465991d9 Merge "Enforce IPsec Tunnel mode for Android Q" am: 81e51bce50
am: ad380770a3

Change-Id: I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7
2019-05-10 11:05:43 -07:00
Benedict Wong
ad380770a3 Merge "Enforce IPsec Tunnel mode for Android Q"
am: 81e51bce50

Change-Id: I6004a243d1840c5f89f400d8f5a3f682054ef12f
2019-05-10 10:57:35 -07:00
Benedict Wong
305873fdd9 [automerger skipped] Merge changes Ic4181fc8,Icffeed2e,I9fdba4a9 into qt-dev
am: e97231be1b -s ours
am skip reason: change_id Ic4181fc857fa880db5553314efa914f870dbe87c with SHA1 64e64ff454 is in history

Change-Id: Id9e175e0d4670fc082f28d55945dfde823672eb6
2019-05-10 10:52:49 -07:00
Benedict Wong
81e51bce50 Merge "Enforce IPsec Tunnel mode for Android Q" 2019-05-10 17:41:04 +00:00
Benedict Wong
084c8b47b6 Enforce IPsec Tunnel mode for Android Q
This commit adds a second condition to whether the device is expected to
have the tunnel mode feature. If a device's first API/launch version is
Q or above, require IPsec tunnels

Bug: 72950854
Test: Ran on device with first API level < Q and == Q.
Change-Id: I7b849ad24a04b6b7899a80f1856236b5ceb5a839
2019-05-10 01:22:13 -07:00
Xin Li
df7916b3ec [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 8982cb36d7 -s ours am: 849c3a4352 -s ours
am: 574d9a15f9 -s ours
am skip reason: subject contains skip directive

Change-Id: I618bf485ce2771a232aebff9b5545b70864a9bba
2019-05-09 22:45:27 -07:00