Commit Graph

810 Commits

Author SHA1 Message Date
Chiachang Wang
9075ae36be Address API review feedback
Address API review feedback to:
 - Rename NetworkAgent#setTeardownDelayMs to
   NetworkAgent#setTeardownDelayMillis
 - Use getters instead of fields in VpnTransportInfo
 - Rename registerDefaultNetworkCallbackAsUid to
   registerDefaultNetworkCallbackForUid in ConnectiivityManager

Bug: 183972850
Bug: 185246410
Fix: 184735863
Test: make update-api
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
Merged-In: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
2021-04-23 02:46:05 +00:00
Chiachang Wang
6f7ac6860e Merge "Address API review feedback" into sc-dev 2021-04-23 00:30:51 +00:00
Aaron Huang
da103b3365 Rename getAllNetworkStateSnapshot which should be pluralized
Address API review feedback, ConnectivityManager#getAllNetworkStateSnapshot
should be pluralized so rename the method to getAllNetworkStateSnapshots

(cherry picked from ag/14221105)
Bug: 183972554
Test: make, FrameworksNetTests
      FrameworksServicesTests
Merged-In: Ic18d17d05984fa2466c962c7843c0ef7183ce77c
Change-Id: Ic18d17d05984fa2466c962c7843c0ef7183ce77c
2021-04-22 17:45:22 +08:00
Treehugger Robot
19a855be79 Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" 2021-04-22 04:43:26 +00:00
Treehugger Robot
7d6e4fb193 Merge "Do not deduce VCN capability if Builder is derived from request" am: ed05115dca am: b91719b526 am: 662285d428
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683015

Change-Id: I6ecdb60e530807c8a93f2709784cf1b5814a2178
2021-04-21 15:21:59 +00:00
Treehugger Robot
ed05115dca Merge "Do not deduce VCN capability if Builder is derived from request" 2021-04-21 14:06:14 +00:00
junyulai
aab5a92321 Do not deduce VCN capability if Builder is derived from request
If the caller constructed the builder from a request, it means
the user might explicitly want the capabilities from the request.
Thus, the NOT_VCN_MANAGED capabilities should not be touched
later.

Test: TH
Fix: 185876442
Change-Id: I92037cc8547fb72de12d6b6402f060f6c98e1853
2021-04-21 19:10:28 +08:00
Treehugger Robot
9eea7b3d09 Merge "Add the related extra information in the javadoc" am: f78aabbf82 am: db0c8c32b1 am: 7663d1760d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681465

Change-Id: I9eb3c2543787a91f211be5eb7b92b66fe696489f
2021-04-21 09:19:13 +00:00
Treehugger Robot
f78aabbf82 Merge "Add the related extra information in the javadoc" 2021-04-21 08:22:43 +00:00
lucaslin
8bee2fd622 Add the related extra information in the javadoc
Bug: 185876442
Test: make docs
Change-Id: Ib0abc43e2009dbf5ee7b6c2a076424834d3d53f2
2021-04-21 10:43:15 +08:00
Chiachang Wang
c7d203dfcb Address API review feedback
Address API review feedback to:
 - Rename NetworkAgent#setTeardownDelayMs to
   NetworkAgent#setTeardownDelayMillis
 - Use getters instead of fields in VpnTransportInfo
 - Rename registerDefaultNetworkCallbackAsUid to
   registerDefaultNetworkCallbackForUid in ConnectiivityManager

Bug: 183972850
Bug: 185246410
Fix: 184735863
Test: make update-api
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Test: atest FrameworksMockingServicesTests
Change-Id: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
2021-04-20 09:30:59 +00:00
Aaron Huang
7f852c082d Merge "Rename getAllNetworkStateSnapshot which should be pluralized" into sc-dev 2021-04-19 16:42:58 +00:00
junyulai
651928c310 [VCN19] Rename get/setSubIds to get/setSubscriptionIds
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215036
Merged-In: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7
Change-Id: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7
  (cherry-picked from ag/14198665)
2021-04-19 17:41:01 +08:00
Aaron Huang
ab615e5c03 Rename getAllNetworkStateSnapshot which should be pluralized
Address API review feedback, ConnectivityManager#getAllNetworkStateSnapshot
should be pluralized so rename the method to getAllNetworkStateSnapshots

Bug: 183972554
Test: make, FrameworksNetTests
      FrameworksServicesTests
Change-Id: Ic18d17d05984fa2466c962c7843c0ef7183ce77c
2021-04-17 14:08:49 +08:00
Junyu Lai
c8499660b2 Merge "[VCN20] Change requestBackgroundNetwork argument order" 2021-04-16 16:04:31 +00:00
Junyu Lai
05614b419a Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" into sc-dev 2021-04-16 15:59:16 +00:00
Lorenzo Colitti
5caa63278d Merge "Don't expose raw IBinder APIs." am: 6f68764bf2 am: c0c07c1b57 am: 15f9321d90
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676436

Change-Id: Ic45558c739cfb065e5c9d6fb5ebf485ceb9a630f
2021-04-16 08:48:41 +00:00
Lorenzo Colitti
6f68764bf2 Merge "Don't expose raw IBinder APIs." 2021-04-16 07:22:13 +00:00
Chiachang Wang
dab31a3374 Merge "Extend framework-connectivity.impl visibility" into sc-dev 2021-04-16 01:13:34 +00:00
junyulai
8c8ac36d9a [VCN20] Change requestBackgroundNetwork argument order
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215095
Merged-In: Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb
Change-Id: Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb
  (cherry-picked from ag/14198667)
2021-04-16 00:16:21 +08:00
Junyu Lai
b1ec3133c3 Merge "[VCN20] Change requestBackgroundNetwork argument order" into sc-dev 2021-04-15 15:57:42 +00:00
Chiachang Wang
f7cd354de5 Merge "Remove hidden method link in public addRoute API" am: fe09ad78cd am: 79edf2d346 am: 01d4caea3c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435

Change-Id: I80ed5448b854960cea0ae58c93491990d54ffd86
2021-04-15 13:16:16 +00:00
TreeHugger Robot
a39ee08b57 Merge "Add documentation" into sc-dev 2021-04-15 10:52:46 +00:00
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
junyulai
9605391498 [VCN19] Rename get/setSubIds to get/setSubscriptionIds
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215036
Ignore-AOSP-First: avoid merge conflict
Change-Id: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7
2021-04-15 18:05:38 +08:00
Lorenzo Colitti
12bcbe5efa Don't expose raw IBinder APIs.
APIs should not expose raw IBinder objects.

Fix: 184735751
Test: builds, boots
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCases:android.net.cts.DnsResolverTest
Change-Id: Ia0c4170def31123f0b79318fec2cfe02e4fcd3bf
2021-04-15 18:47:21 +09:00
Chalard Jean
3c824eca72 Add documentation
Bug: 185121472
Test: doc-only change
Change-Id: I5fd68b209959043f6fe15ac34629c51233fea596
2021-04-15 18:07:56 +09:00
Chiachang Wang
7ceeabe0da 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
Chiachang Wang
3270871367 Extend framework-connectivity.impl visibility
Allow netlegacy22.api to use hidden connectivity methods.

Bug: 182859030
Test: m
Change-Id: I92936afb9fb533ea3b426490eb9617389f99fc8b
2021-04-15 13:06:39 +08:00
Chalard Jean
85e65c8fc1 Allow network providers to set the linger duration.
Test: atest CtsNetTestCases:NetworkAgentTest#testSetLingerDuration
Ignore-AOSP-First: prevent merge conflict
CTS-Coverage-Bug: 184796264
Bug: 184227264
Change-Id: I7f420faa40863385114705d6971cf00887d03318
2021-04-14 20:26:12 +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
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
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
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
f212a922e9 Merge "Rename APIs in NetworkAgentConfig.Builder" 2021-04-12 14:10:46 +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
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
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