junyulai
ca657cbca4
[VCN20] Change requestBackgroundNetwork argument order
...
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215095
Ignore-AOSP-First: avoid build break caused by multipatch automerge
Change-Id: Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb
2021-04-15 18:43:48 +08:00
Lorenzo Colitti
f40b20ec1c
Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: 7dc61be0da am: b09793ab41
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568
Change-Id: I1193382337088113bf64a636b0b70429d28f8be6
2021-04-14 03:00:32 +00:00
Lorenzo Colitti
b09793ab41
Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: 7dc61be0da
...
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
7dc61be0da
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
Lorenzo Colitti
a34d4892a4
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
Pedro Loureiro
386aeaa3d9
Merge "Add lint baseline to address NewApi errors" into sc-dev
2021-04-13 14:12:41 +00:00
Chiachang Wang
229de02f5b
Merge "Extend framework-connectivity.impl visibility to more test" into sc-dev
2021-04-13 13:27:45 +00:00
Chiachang Wang
bb996c3b1d
Merge "Make getUid a method on UserHandle itself instead of static" am: 9500ca6b5f am: e2a6a92c30 am: c3f73bd1ac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185
Change-Id: Ic0b7887630c00404ff354c193b82a96930940556
2021-04-13 13:06:43 +00:00
Chiachang Wang
c3f73bd1ac
Merge "Make getUid a method on UserHandle itself instead of static" am: 9500ca6b5f am: e2a6a92c30
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185
Change-Id: Icc006ab751a1a03aa3c09c1999a6141ff061081d
2021-04-13 11:54:57 +00:00
Pedro Loureiro
57bc16e08a
Add lint baseline to address NewApi errors
...
We are enabling a new lint check where the min sdk != compile sdk.
It has produced a lot of errors and adding the baseline file(s)
allows us to continue work without introducing more problems.
Bug: 150847901
Test: m lint-check
Change-Id: Ide8a8fe80ba31396f23853ab266afcbcc33af9a6
2021-04-13 10:51:51 +01:00
Chiachang Wang
e2a6a92c30
Merge "Make getUid a method on UserHandle itself instead of static" am: 9500ca6b5f
...
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
9500ca6b5f
Merge "Make getUid a method on UserHandle itself instead of static"
2021-04-13 08:15:47 +00:00
Chiachang Wang
426a6de6b3
Extend framework-connectivity.impl visibility to more test
...
Allow captive portal tests to use hidden connectivity methods.
Bug: 182859030
Test: m
Change-Id: I2c51cbefa6d56c7ec53bacfffe735fa9d14c6510
2021-04-13 12:53:06 +08:00
Chiachang Wang
e2239bc4b2
Merge "Rename APIs in NetworkAgentConfig.Builder" am: f212a922e9 am: 3786083176 am: d811a2671d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047
Change-Id: I1988750dd4b65a3d74c33c8fc120bb3bcb705320
2021-04-12 15:14:26 +00:00
Paul Hu
f63d85dc00
Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 am: a69d2280fc am: 89edca00d1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788
Change-Id: I1d472c9cffaa0c7f35b284b97fa374b03232a7f4
2021-04-12 15:13:48 +00:00
Chiachang Wang
d811a2671d
Merge "Rename APIs in NetworkAgentConfig.Builder" am: f212a922e9 am: 3786083176
...
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
89edca00d1
Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 am: a69d2280fc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788
Change-Id: Ib89ecce40b1361b9f74d66d7969035c7b94702e0
2021-04-12 14:46:35 +00:00
Chiachang Wang
3786083176
Merge "Rename APIs in NetworkAgentConfig.Builder" am: f212a922e9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047
Change-Id: Ia437814497ef603043980c37add9e2ddfccf11c9
2021-04-12 14:25:01 +00:00
Chiachang Wang
f212a922e9
Merge "Rename APIs in NetworkAgentConfig.Builder"
2021-04-12 14:10:46 +00:00
Paul Hu
a69d2280fc
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
f5324d7d03
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
c3663377e7
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
Remi NGUYEN VAN
a9dfa785a2
Merge "Add option to make sign-in notification ongoing" into sc-dev
2021-04-09 06:17:17 +00:00
TreeHugger Robot
d9c09ee7cb
Merge "Add doc for NetworkScore#getLegacyInt" into sc-dev
2021-04-09 04:38:09 +00:00
Remi NGUYEN VAN
cb7360eecb
Merge "Improve documentation on simulateDataStall" am: 3b4f0832bd am: b241ce07a9 am: 3c5cdf0dbc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669505
Change-Id: I9484583b0249f4f67fdf6216f9ca72b900320699
2021-04-09 02:36:41 +00:00
Remi NGUYEN VAN
6a0e0809b4
Merge "Set ParseException constructors as public" am: a2a324f843 am: 7251eb2f0c am: 352fc488f2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669051
Change-Id: I7b744bdacf5e5929a1d0ac60832a355ebe8ce9a9
2021-04-09 02:35:43 +00:00
Remi NGUYEN VAN
e09cf913ca
Merge "Replace fields with getters in keepalive API" am: 445fd7e9d9 am: e5bc9e1aa1 am: bec77cd512
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669345
Change-Id: I73f6f89eb2d1255743d10c1ec1c92770845bdd63
2021-04-09 02:34:59 +00:00
Remi NGUYEN VAN
a4ad1df2da
Merge "Add RequiresPermission to TestNetworkManager" am: 58a22b1d8f am: 6e9d84438c am: e58f448568
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187
Change-Id: Ifba7b5b88e162caaf7c5393051f867655cf1b9fb
2021-04-09 02:34:17 +00:00
Remi NGUYEN VAN
3c5cdf0dbc
Merge "Improve documentation on simulateDataStall" am: 3b4f0832bd am: b241ce07a9
...
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
352fc488f2
Merge "Set ParseException constructors as public" am: a2a324f843 am: 7251eb2f0c
...
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
bec77cd512
Merge "Replace fields with getters in keepalive API" am: 445fd7e9d9 am: e5bc9e1aa1
...
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
e58f448568
Merge "Add RequiresPermission to TestNetworkManager" am: 58a22b1d8f am: 6e9d84438c
...
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
691ba0b6c3
[automerger skipped] Merge "Use String in CaptivePortalData underlying types" am: 55d93ddb7e am: dae21e8596 am: 202721a5b7 -s ours
...
am skip reason: skip tag Change-Id Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97 with SHA-1 60372ff53d is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644997
Change-Id: I5bf71b3f1f938d06eae5c3739af081d49ea3777b
2021-04-09 01:29:27 +00:00
Remi NGUYEN VAN
202721a5b7
Merge "Use String in CaptivePortalData underlying types" am: 55d93ddb7e am: dae21e8596
...
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
b241ce07a9
Merge "Improve documentation on simulateDataStall" am: 3b4f0832bd
...
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
7251eb2f0c
Merge "Set ParseException constructors as public" am: a2a324f843
...
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
e5bc9e1aa1
Merge "Replace fields with getters in keepalive API" am: 445fd7e9d9
...
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
6e9d84438c
Merge "Add RequiresPermission to TestNetworkManager" am: 58a22b1d8f
...
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
dae21e8596
Merge "Use String in CaptivePortalData underlying types" am: 55d93ddb7e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644997
Change-Id: If054ef1739a273e4a203be44675d3b410784dedf
2021-04-09 01:00:10 +00:00
Chiachang Wang
1091a06338
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
Remi NGUYEN VAN
3b4f0832bd
Merge "Improve documentation on simulateDataStall"
2021-04-09 00:21:34 +00:00
Remi NGUYEN VAN
a2a324f843
Merge "Set ParseException constructors as public"
2021-04-09 00:20:33 +00:00
Remi NGUYEN VAN
445fd7e9d9
Merge "Replace fields with getters in keepalive API"
2021-04-09 00:20:13 +00:00
Remi NGUYEN VAN
58a22b1d8f
Merge "Add RequiresPermission to TestNetworkManager"
2021-04-09 00:19:51 +00:00
Remi NGUYEN VAN
7391a9ce21
Merge "Make service-connectivity APEX-only" into sc-dev
2021-04-09 00:18:35 +00:00
Remi NGUYEN VAN
55d93ddb7e
Merge "Use String in CaptivePortalData underlying types"
2021-04-09 00:17:59 +00:00
James Mattis
148043b2a0
Merge "Adding OEM Network Preferences for testing" am: ee638e2670 am: bad8f6262f am: c4c1b9c820
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659163
Change-Id: Ia028efd68ae8ce229c5382dc4798671da9124a5b
2021-04-08 22:58:14 +00:00
James Mattis
c4c1b9c820
Merge "Adding OEM Network Preferences for testing" am: ee638e2670 am: bad8f6262f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659163
Change-Id: I982301cdaf36457d1adecbcda1ffa6457fd3bfab
2021-04-08 22:11:04 +00:00
James Mattis
bad8f6262f
Merge "Adding OEM Network Preferences for testing" am: ee638e2670
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659163
Change-Id: I14a27b3b9e7dad67fe9ca275527926e63d465b9a
2021-04-08 21:29:36 +00:00
James Mattis
ee638e2670
Merge "Adding OEM Network Preferences for testing"
2021-04-08 20:51:05 +00:00