Chiachang Wang
965b73b955
Merge "Remove hidden method link in public addRoute API" am: 7e1afe7650 am: d9f6d6e397
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435
Change-Id: I3477f3a78ebee26d950ce6c6eaf45cdef8a5ee6d
2021-04-15 12:46:41 +00:00
Chiachang Wang
d9f6d6e397
Merge "Remove hidden method link in public addRoute API" am: 7e1afe7650
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435
Change-Id: Ide004783057673561ea631e0a59ce4c01c2841af
2021-04-15 11:53:02 +00:00
Chiachang Wang
7e1afe7650
Merge "Remove hidden method link in public addRoute API"
2021-04-15 11:26:41 +00:00
Treehugger Robot
dc05bc9aa7
Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf77 am: 7f7769b82e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676426
Change-Id: I03024cb93ea05cccb7ec43a19c3430ef20637eeb
2021-04-15 10:54:23 +00:00
Treehugger Robot
7f7769b82e
Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf77
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676426
Change-Id: Ia433edec97f3a02c95dcf89f9f8ae80244063a89
2021-04-15 10:01:20 +00:00
Chiachang Wang
9ebe6cfeb3
Remove hidden method link in public addRoute API
...
The build will complain after moving connectivity framework code
outside framework because the hidden methods/members accesses are
not allowed anymore. Link to a hidden class will not work since
it's not visible in public.
Bug: 182859030
Test: make docs
Change-Id: I5726f80be7cf92b648ce851d9601d5f58bc2b647
2021-04-15 16:21:00 +08:00
lucaslin
df2a314d6c
Add test for [set|is]BypassableVpn
...
Bug: 182963397
Test: 1. atest CtsNetTestCases:NetworkAgentConfigTest
2. atest CtsNetTestCasesLatestSdk:NetworkAgentConfigTest
Change-Id: I0250a0313d3a7561ab8efa851fbc06f5bce11185
2021-04-15 15:44:01 +08:00
Bill Yi
3b8115928b
[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 24c6eaea15 -s ours am: 7771a62ab1 -s ours
...
am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674888
Change-Id: Ie4dfff3cfbe5df4b60353217e8f99611438fd2be
2021-04-14 06:31:20 +00:00
Bill Yi
7771a62ab1
[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 24c6eaea15 -s ours
...
am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674888
Change-Id: I92a667574c0f8f8754c6c1c28d90c32f26e8d3b3
2021-04-14 05:46:16 +00:00
Bill Yi
24c6eaea15
Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE"
2021-04-14 04:59:51 +00:00
Bill Yi
51f05deb78
Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE
...
Merged-In: I735b41ed53ce7d374b5d36c4aee79f73d0334234
Merged-In: I9999bfe514fffa9f300643e74942db5ae556670a
Change-Id: If4b670a158e561d8feb03e12aef2d295c5109d43
2021-04-13 19:36:45 -07:00
Lorenzo Colitti
d76eb01fbe
Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: c6a866fb42
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568
Change-Id: I3c13a27c78cb824d366095edbf37d30527978def
2021-04-14 02:33:11 +00:00
Lorenzo Colitti
c6a866fb42
Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568
Change-Id: I4febfa2d96c678decff23eb08e40ba0e33e4c7bf
2021-04-14 01:24:19 +00:00
Bill Yi
7d7b5bcb9f
[automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: 32cf6f6f6b -s ours
...
am skip reason: skip tag Change-Id I9af489ae7bdd448c552c97d4478f1760a13fb970 with SHA-1 4aed3924ff is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14176451
Change-Id: I9999bfe514fffa9f300643e74942db5ae556670a
2021-04-14 00:31:09 +00:00
Bill Yi
32cf6f6f6b
Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I9af489ae7bdd448c552c97d4478f1760a13fb970
Change-Id: I368382a9924b2d3dc697ae6450239f23d5cbf520
2021-04-13 15:34:44 -07:00
Lorenzo Colitti
1479494fd5
Add @RedactionType annotations to VpnTransportInfo.
...
This is in response to API council feedback.
Test: m
Bug: 185226718
Change-Id: I63d7249e7d14ac00558f311a3583f6adbf80e3d9
2021-04-14 00:28:19 +09:00
Chiachang Wang
7ebbfc98d2
Merge "Make getUid a method on UserHandle itself instead of static" am: 4bc8b1386f am: 84c2646d26
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185
Change-Id: Icc006ab751a1a03aa3c09c1999a6141ff061081d
2021-04-13 11:54:57 +00:00
Chiachang Wang
84c2646d26
Merge "Make getUid a method on UserHandle itself instead of static" am: 4bc8b1386f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185
Change-Id: If47dccc346aa78c7cb49aafbd5e07d35d3403c6a
2021-04-13 08:51:12 +00:00
Chiachang Wang
4bc8b1386f
Merge "Make getUid a method on UserHandle itself instead of static"
2021-04-13 08:15:47 +00:00
Chiachang Wang
38b1591c16
Merge "Add SDK version check to skip S added API test" am: 045961b828 am: 97247ff9a3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167
Change-Id: I057a0d7c6a8697e301f6aa1b37088140d0cc8bb6
2021-04-13 06:02:20 +00:00
Chiachang Wang
97247ff9a3
Merge "Add SDK version check to skip S added API test" am: 045961b828
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167
Change-Id: I40516d56f9ca477d62c362dbdf11aad713c620ae
2021-04-13 05:17:53 +00:00
Chiachang Wang
045961b828
Merge "Add SDK version check to skip S added API test"
2021-04-13 04:30:36 +00:00
Chiachang Wang
d2bce7b6e3
Add SDK version check to skip S added API test
...
NetworkAgentConfigTest is a part of CtsNetTestCasesLatestSdk.
It will be used in mainline test with a R build. Test will
fail with method not found error. Add a version check to skip
the S added API tests.
Test: atest NetworkAgentConfigTest in R and S device
Fix: 185151127
Change-Id: Ib372e68afa99af455eb2713c8f6f1c8ef1d4cfdf
2021-04-13 10:18:36 +08:00
Lorenzo Colitti
4752f8438a
Merge "Add debug logging to requestRouteToHostAddress." am: f6f74d517f am: f37ac683f9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671786
Change-Id: Idfab2681aa129b9e2a699c0c89e2d0fcf36e0c73
2021-04-12 14:48:24 +00:00
Chiachang Wang
3633ac43f6
Merge "Rename APIs in NetworkAgentConfig.Builder" am: 3cbfc11c93 am: d9feace234
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047
Change-Id: Ia16a26e64e65687faf6303c392c4a85de52129e3
2021-04-12 14:47:46 +00:00
Paul Hu
edd5b0f3a8
Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 am: 33ec185c5e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788
Change-Id: Ib89ecce40b1361b9f74d66d7969035c7b94702e0
2021-04-12 14:46:35 +00:00
Lorenzo Colitti
f37ac683f9
Merge "Add debug logging to requestRouteToHostAddress." am: f6f74d517f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671786
Change-Id: I87f0ab1fe739359c115fce8da250a00b5fd0242b
2021-04-12 14:30:00 +00:00
Chiachang Wang
d9feace234
Merge "Rename APIs in NetworkAgentConfig.Builder" am: 3cbfc11c93
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047
Change-Id: Ia437814497ef603043980c37add9e2ddfccf11c9
2021-04-12 14:25:01 +00:00
Lorenzo Colitti
f6f74d517f
Merge "Add debug logging to requestRouteToHostAddress."
2021-04-12 14:24:58 +00:00
Chiachang Wang
3cbfc11c93
Merge "Rename APIs in NetworkAgentConfig.Builder"
2021-04-12 14:10:46 +00:00
Paul Hu
33ec185c5e
Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788
Change-Id: Ie2f0463dd064ad7363054a5c08b6e09b54eea6cb
2021-04-12 14:04:27 +00:00
Chiachang Wang
3d1e89d298
Rename APIs in NetworkAgentConfig.Builder
...
As API review feedback, rename disableProvisioningNotification()
to setEnabledProvisioningNotification and disableNat64Detection()
to setEnabledNat64Detection. Also, update code in caller side
accordingly.
Bug: 184735772
Test: make update-api ; atest FrameworksNetTests
Change-Id: If7305634863d1503c967e5593ebd0c8af2174bea
2021-04-12 17:27:47 +08:00
paulhu
7fafd1827f
Remove TcpRepairWindow from module-lib API
...
Both TcpRepairWindow and TcpKeepaliveController(user) are in the
connectivity module, so TcpRepairWindow doesn't need to be
the module-lib API. Thus, remove TcpRepairWindow from
module-lib API.
Bug: 172183305
Test: m update-api
Change-Id: I8fde726f8ad73637e6deab69ea83b3699bb2cf45
2021-04-12 14:26:55 +08:00
James Mattis
3842f94fe3
Merge "Adding log history for setOemNetworkPreference()" am: 7fe91d40f1 am: 98b7cc58c6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666340
Change-Id: Ibc8b620025d5d61d34034f29e6f50d48f30b9b34
2021-04-09 17:07:33 +00:00
James Mattis
98b7cc58c6
Merge "Adding log history for setOemNetworkPreference()" am: 7fe91d40f1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666340
Change-Id: I8c9faa1652e702b597cff87c7b5f22f859611dba
2021-04-09 16:27:54 +00:00
Lorenzo Colitti
7e27c5412f
Add debug logging to requestRouteToHostAddress.
...
Results in:
04-10 00:52:44.887 1511 2362 D ConnectivityService: requestRouteToHostAddress /192.0.2.3 [101 CELLULAR] ok=true
Bug: 182963397
Test: atest ConnectivityManagerLegacyTest
Change-Id: I4eeb17dd9096705d959516018aedb9173ff97023
2021-04-10 01:04:05 +09:00
Remi NGUYEN VAN
05d12ae637
Merge "Improve documentation on simulateDataStall" am: faf00d43b9 am: dcd39e81a6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669505
Change-Id: Ia0f2e417d06fac1695929e995b1e7c09b82a24da
2021-04-09 01:48:09 +00:00
Remi NGUYEN VAN
9dea9579f6
Merge "Set ParseException constructors as public" am: 4abe99e563 am: 592ff78b65
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669051
Change-Id: I07fa3e87f4faff89f35b6a3500d3ccf0f5a10e94
2021-04-09 01:47:41 +00:00
Remi NGUYEN VAN
2c5dcb4c03
Merge "Replace fields with getters in keepalive API" am: bc01e88edc am: 4c1a04c308
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669345
Change-Id: I1cf5e79229e5ffda0a77ac65b552ba0875b347f3
2021-04-09 01:47:22 +00:00
Remi NGUYEN VAN
5780b3c45f
Merge "Add RequiresPermission to TestNetworkManager" am: 94c8957576 am: 2e4fce8669
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187
Change-Id: I8208c38f4c7a81a1217cc8aeca78374171eae69a
2021-04-09 01:46:43 +00:00
Remi NGUYEN VAN
70c7bba941
Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: 793d607d75 am: 1474024e59
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304
Change-Id: Iaec8ac01bbb518af8e14c0936cf8d8f2f75d8dd4
2021-04-09 01:24:14 +00:00
Remi NGUYEN VAN
19381a5938
Merge "Use String in CaptivePortalData underlying types" am: 4e34417eec am: e9aecbb5d2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644997
Change-Id: I6a1cf633329d2b3cb90a0ea68e946777f9feff89
2021-04-09 01:23:58 +00:00
Remi NGUYEN VAN
dcd39e81a6
Merge "Improve documentation on simulateDataStall" am: faf00d43b9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669505
Change-Id: Idc8f1f13e8b0553cda6f242b95ea72f79f54b9b5
2021-04-09 01:17:31 +00:00
Remi NGUYEN VAN
592ff78b65
Merge "Set ParseException constructors as public" am: 4abe99e563
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669051
Change-Id: I418a1682eb64b2b54defa37ce12ffdf5aa805b64
2021-04-09 01:13:41 +00:00
Remi NGUYEN VAN
4c1a04c308
Merge "Replace fields with getters in keepalive API" am: bc01e88edc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669345
Change-Id: I339284a9f509d970a8c20f4738e42b25ca05c28c
2021-04-09 01:11:20 +00:00
Remi NGUYEN VAN
2e4fce8669
Merge "Add RequiresPermission to TestNetworkManager" am: 94c8957576
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187
Change-Id: I3ea1379e439a1dfda99e9332275ea38efed86f4f
2021-04-09 01:08:42 +00:00
Remi NGUYEN VAN
1474024e59
Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: 793d607d75
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304
Change-Id: I52e7aaca589eefb385cec78bf4372922d8089018
2021-04-09 01:05:40 +00:00
Remi NGUYEN VAN
e9aecbb5d2
Merge "Use String in CaptivePortalData underlying types" am: 4e34417eec
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644997
Change-Id: If054ef1739a273e4a203be44675d3b410784dedf
2021-04-09 01:00:10 +00:00
James Mattis
6e4405f926
Adding log history for setOemNetworkPreference()
...
Adding historical logging for the setOemNetworkPreference() calls. This
will last across reboots.
Bug: 177257940
Bug: 176494815
Test: atest FrameworksNetTests
Change-Id: I4fc35fd58ff741830aa292adc1c559b4279ad8f9
2021-04-08 17:40:06 -07:00
Chiachang Wang
97565cfdb3
Make getUid a method on UserHandle itself instead of static
...
This commit addresses the API review feedback that getUid()
will be better to make it be a method on UserHandle itself
rather than a static method.
Update as it is and update the corresponding usages.
Fix: 184735865
Test: make update-api
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I33844309224d84764704255d251fadc8940202ca
2021-04-09 08:33:07 +08:00