Commit Graph

12208 Commits

Author SHA1 Message Date
Treehugger Robot
5f92df3f89 Merge "[VCN21.1] Verify capability is not added if specifier is present" am: 20d9f4722e am: 82e910ecc5 am: 68f8081aae am: c831d5a60b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705134

Change-Id: Ifef5891d703068dc97962575fc81f64b10c2fd71
2021-05-18 10:36:17 +00:00
Mark Chien
1377ae64b6 Merge "Check whether feature is enabled by compare with apex version" am: 84a8a13a92 am: c59d6fa12d am: 2d577ad3d2 am: e66481b436
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708088

Change-Id: Ib0430e26d27fd59ef29d4ee44557d2e1163160a1
2021-05-18 10:36:05 +00:00
Treehugger Robot
c831d5a60b Merge "[VCN21.1] Verify capability is not added if specifier is present" am: 20d9f4722e am: 82e910ecc5 am: 68f8081aae
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705134

Change-Id: Iba23024382a3b9ab8d8f0946eb902c6c3dd19975
2021-05-18 10:16:58 +00:00
Mark Chien
e66481b436 Merge "Check whether feature is enabled by compare with apex version" am: 84a8a13a92 am: c59d6fa12d am: 2d577ad3d2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708088

Change-Id: Ifcc571196e302245816b663155bc57aabdef542b
2021-05-18 10:16:47 +00:00
Treehugger Robot
5280262322 Merge "[VCN21.1] Verify capability is not added if specifier is present" am: 20d9f4722e am: 82e910ecc5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705134

Change-Id: I14eae298090e963dab835be59c92a5f68e193a7f
2021-05-18 09:57:20 +00:00
Mark Chien
92082dad6e Merge "Check whether feature is enabled by compare with apex version" am: 84a8a13a92 am: c59d6fa12d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708088

Change-Id: I3de35429df8000efa832f0328b5638d0e3fcff7f
2021-05-18 09:56:41 +00:00
Treehugger Robot
68f8081aae Merge "[VCN21.1] Verify capability is not added if specifier is present" am: 20d9f4722e am: 82e910ecc5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705134

Change-Id: Iefa25664714ee187be4ddc4359afcd0968ab4ecf
2021-05-18 09:56:05 +00:00
Mark Chien
2d577ad3d2 Merge "Check whether feature is enabled by compare with apex version" am: 84a8a13a92 am: c59d6fa12d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708088

Change-Id: Id993424e895917267ac5ffa43ab3362169c1d37c
2021-05-18 09:56:00 +00:00
Treehugger Robot
82e910ecc5 Merge "[VCN21.1] Verify capability is not added if specifier is present" am: 20d9f4722e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705134

Change-Id: Iae49fd663e9b90e935b9065ef60561f2b4c55439
2021-05-18 09:36:16 +00:00
Treehugger Robot
20d9f4722e Merge "[VCN21.1] Verify capability is not added if specifier is present" 2021-05-18 08:35:06 +00:00
Lorenzo Colitti
598fd1e3dd Merge "Add a CTS tests for setIncludeOtherUidNetworks." into sc-dev am: 02de682901
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14598440

Change-Id: I9c38abc5dce8127b66f3cf4e960f577e89284676
2021-05-18 07:12:50 +00:00
Lorenzo Colitti
02de682901 Merge "Add a CTS tests for setIncludeOtherUidNetworks." into sc-dev 2021-05-18 06:47:43 +00:00
Lorenzo Colitti
ad9c644b6b Add a CTS tests for setIncludeOtherUidNetworks.
Bug: 187921303
Test: test-only change
Ignore-AOSP-First: avoid merge conflicts
Change-Id: I8e259041dad3fb9c38202cbb12b344de15f4101f
2021-05-18 04:43:20 +00:00
Mark Chien
c59d6fa12d Merge "Check whether feature is enabled by compare with apex version" am: 84a8a13a92
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708088

Change-Id: Iefbd6fa6a061614b83d115219f8939dee8794bb7
2021-05-18 03:37:13 +00:00
Mark Chien
84a8a13a92 Merge "Check whether feature is enabled by compare with apex version" 2021-05-18 03:09:20 +00:00
Aaron Huang
00db48dedf Merge "Add required permission to Tethering" into sc-dev am: 985e1e337d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14351735

Change-Id: Icbf298f39939d13cbf17578a9c65d08b5790c1fd
2021-05-17 14:26:50 +00:00
Aaron Huang
985e1e337d Merge "Add required permission to Tethering" into sc-dev 2021-05-17 14:15:54 +00:00
junyulai
f15fb56f73 [VCN21.1] Verify capability is not added if specifier is present
Test: atest NetworkRequestTest#testBypassingVcn
Bug: 176939355
Change-Id: I3fdd7a08ac9fd667633b68dc935abce024dd3a4d
2021-05-17 07:03:53 +00:00
TreeHugger Robot
5f136f02cc Merge "Use SettingsShim to hide different implementation in shim" into sc-dev am: 4547356487
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14467433

Change-Id: Iee71677f0cf215e546fc9dca53d72e0f67edd115
2021-05-15 06:49:28 +00:00
TreeHugger Robot
4547356487 Merge "Use SettingsShim to hide different implementation in shim" into sc-dev 2021-05-15 06:27:38 +00:00
Mark Chien
67e168f5c7 Merge "Test mts against last stable api level" am: a59a146b36 am: 9015e276aa am: a9ba6f4c25 am: 1ae2293558
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686012

Change-Id: Ib63f9af1a0a80d70932202c0fe0d3a3efcc6c9e5
2021-05-14 10:38:48 +00:00
Mark Chien
1ae2293558 Merge "Test mts against last stable api level" am: a59a146b36 am: 9015e276aa am: a9ba6f4c25
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686012

Change-Id: Ia17a88bf2f5ab09f46f0af904da63f4c3c4ad3d1
2021-05-14 10:27:17 +00:00
Mark Chien
540f0d3ce3 Merge "Test mts against last stable api level" am: a59a146b36 am: 9015e276aa am: 726b814899
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686012

Change-Id: I9d2d08b9c9397c247e2afd54b25a21631233c585
2021-05-14 10:26:06 +00:00
Mark Chien
726b814899 Merge "Test mts against last stable api level" am: a59a146b36 am: 9015e276aa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686012

Change-Id: I34e9a66e7d603fe71c5ee1591787344e245b70ac
2021-05-14 10:03:22 +00:00
Mark Chien
a9ba6f4c25 Merge "Test mts against last stable api level" am: a59a146b36 am: 9015e276aa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686012

Change-Id: I0cac4fef0300e0b341c7090c5be6e9489c62794f
2021-05-14 10:03:19 +00:00
Mark Chien
9015e276aa Merge "Test mts against last stable api level" am: a59a146b36
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686012

Change-Id: I51562dc48242c7d2f2f53f7f9fe7b5797e945ede
2021-05-14 09:36:00 +00:00
Mark Chien
a59a146b36 Merge "Test mts against last stable api level" 2021-05-14 09:00:11 +00:00
markchien
a3ef48117f Check whether feature is enabled by compare with apex version
Replace the isFeatureEnabled function which is check with apex version.

Bug: 187946226
Test: Set device config flag and check the result
Change-Id: Iba44a01e2fdd0698dcb338ea4a8fe8147cbaa7dd
2021-05-14 16:56:33 +08:00
Treehugger Robot
b2ad823930 Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56 am: c7ea77ce6a am: 3034280a1f am: 8a6fcb1391
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705135

Change-Id: I18a7a217f9e064a304ed0ca681f7c6534e339bab
2021-05-14 07:09:37 +00:00
Treehugger Robot
83016aca6c Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56 am: c7ea77ce6a am: ad56a81b2d am: 3c5a00a31c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705135

Change-Id: I1d8925ca5f70f226ee5fd36e473e283549195f33
2021-05-14 07:09:24 +00:00
Treehugger Robot
8a6fcb1391 Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56 am: c7ea77ce6a am: 3034280a1f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705135

Change-Id: Ic403510764eb2745f7cb6e42cf18771fea801880
2021-05-14 06:42:49 +00:00
Treehugger Robot
3c5a00a31c Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56 am: c7ea77ce6a am: ad56a81b2d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705135

Change-Id: I0e4deaccf95ea9422654e85a3fa4df9d6752455e
2021-05-14 06:41:40 +00:00
Treehugger Robot
3034280a1f Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56 am: c7ea77ce6a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705135

Change-Id: I00e51d4f8de97c7b67aef028e9ee358678e82379
2021-05-14 06:25:27 +00:00
Treehugger Robot
ad56a81b2d Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56 am: c7ea77ce6a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705135

Change-Id: If5ab413d6cea71a3dcc98634d7ad8a11fbd2bbd1
2021-05-14 06:25:15 +00:00
Treehugger Robot
c7ea77ce6a Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705135

Change-Id: I0de41fe2ba6d2bc691b5693a81da368ae5e0e025
2021-05-14 06:10:30 +00:00
Treehugger Robot
6748f93e56 Merge "Re-enable check for VpnTransportInfo session ID." 2021-05-14 05:58:35 +00:00
Treehugger Robot
29ea3d8562 Merge "Don't run testRequestBackgroundNetwork in instant app mode" am: 3531b188ce am: e7bb625eaf am: 3e35248588 am: a36bdafbf0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1695289

Change-Id: Id86e791794c1da48735d174478290c1d8958b318
2021-05-14 05:23:12 +00:00
Treehugger Robot
4d53159442 Merge "Don't run testRequestBackgroundNetwork in instant app mode" am: 3531b188ce am: e7bb625eaf am: 0d5000dbbd am: e7cbc00b27
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1695289

Change-Id: Iec34f1e3934e1d3013325f2a9b5e038cc2c83f68
2021-05-14 05:23:06 +00:00
Treehugger Robot
a36bdafbf0 Merge "Don't run testRequestBackgroundNetwork in instant app mode" am: 3531b188ce am: e7bb625eaf am: 3e35248588
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1695289

Change-Id: I397922aa251135f8eccb020a878cb0dba09bb960
2021-05-14 05:10:59 +00:00
Treehugger Robot
e7cbc00b27 Merge "Don't run testRequestBackgroundNetwork in instant app mode" am: 3531b188ce am: e7bb625eaf am: 0d5000dbbd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1695289

Change-Id: Icc5b0fff3d74f3f577e591fcb7046f4c42da558e
2021-05-14 05:09:38 +00:00
Treehugger Robot
3e35248588 Merge "Don't run testRequestBackgroundNetwork in instant app mode" am: 3531b188ce am: e7bb625eaf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1695289

Change-Id: I20ed893903150e44e1fe6f4bd13ae2ea2b0c537c
2021-05-14 04:54:08 +00:00
Treehugger Robot
0d5000dbbd Merge "Don't run testRequestBackgroundNetwork in instant app mode" am: 3531b188ce am: e7bb625eaf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1695289

Change-Id: Iec0e338d556495c7a2e14b273d8fefad31983dd8
2021-05-14 04:53:58 +00:00
Treehugger Robot
e7bb625eaf Merge "Don't run testRequestBackgroundNetwork in instant app mode" am: 3531b188ce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1695289

Change-Id: Ib447d41a24fedf2b23881653c23674f526a37c65
2021-05-14 04:37:49 +00:00
Treehugger Robot
3531b188ce Merge "Don't run testRequestBackgroundNetwork in instant app mode" 2021-05-14 04:09:43 +00:00
Nucca Chen
d19b8f2464 Merge "bpf: Add interface index to BPF devmap" am: aa10ddfa6f am: 72bd34e343 am: 6b5e448f79 am: c702f5c9ba
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703125

Change-Id: I8965f9db0c831320cbc5cd319da7531614070112
2021-05-14 03:47:54 +00:00
Junyu Lai
a853fde945 [automerger skipped] Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504 am: ab2a5cd02f -s ours am: 655aaef84b -s ours
am skip reason: Merged-In I0b02d01cd8749d81c9d020dee7fdb4f80e18ae98 with SHA-1 36aa3f237c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006

Change-Id: I174fa67ee0f27cd6024fc40abeb3cecd248af5f0
2021-05-14 03:47:50 +00:00
Nucca Chen
1ad951705f Merge "bpf: Add interface index to BPF devmap" am: aa10ddfa6f am: 72bd34e343 am: 76cc470496 am: 1ed7317a2f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703125

Change-Id: I3399596926792ae3433d9b4b2860bd1b5f334577
2021-05-14 03:47:39 +00:00
Junyu Lai
09a87eb28c [automerger skipped] Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504 am: d1c8af2783 -s ours am: d0fc569f67 -s ours
am skip reason: Merged-In I0b02d01cd8749d81c9d020dee7fdb4f80e18ae98 with SHA-1 36aa3f237c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006

Change-Id: I3496a49dd6c65e7e6d1da3a4084b760143335cc2
2021-05-14 03:47:19 +00:00
Nucca Chen
c702f5c9ba Merge "bpf: Add interface index to BPF devmap" am: aa10ddfa6f am: 72bd34e343 am: 6b5e448f79
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703125

Change-Id: Ifb15fec20d7fc52ee230df330113d4ba0316426f
2021-05-14 03:26:46 +00:00
Junyu Lai
655aaef84b [automerger skipped] Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504 am: ab2a5cd02f -s ours
am skip reason: Merged-In I0b02d01cd8749d81c9d020dee7fdb4f80e18ae98 with SHA-1 36aa3f237c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006

Change-Id: If646033a664673f26961a7d7f35fce865e2a6794
2021-05-14 03:26:19 +00:00