Commit graph android_packages_modules_Co.../framework
Message SHA1
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

Chalard Jean   authored and   junyulai   commited 2021-04-14 20:26:12 +08:00
e634b28204
Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: c6a866fb42 am: d76eb01fbe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I1193382337088113bf64a636b0b70429d28f8be6

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-04-14 03:00:32 +00:00
cb6798a90a
Add @RedactionType annotations to VpnTransportInfo.
This is in response to API council feedback.

Test: m
Bug: 185226718
Change-Id: I63d7249e7d14ac00558f311a3583f6adbf80e3d9

Lorenzo Colitti   commited 2021-04-14 00:28:19 +09:00
1479494fd5
Merge "Add lint baseline to address NewApi errors" into sc-dev
Pedro Loureiro   authored and   Android (Google) Code Review   commited 2021-04-13 14:12:41 +00:00
8d6b5c8d6f
Merge "Extend framework-connectivity.impl visibility to more test" into sc-dev
Chiachang Wang   authored and   Android (Google) Code Review   commited 2021-04-13 13:27:45 +00:00
93f6590e65
Merge "Make getUid a method on UserHandle itself instead of static" am: 4bc8b1386f am: 84c2646d26 am: 7ebbfc98d2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: Ic0b7887630c00404ff354c193b82a96930940556

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-04-13 13:06:43 +00:00
00cb5f4763
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

Pedro Loureiro   authored and   Anton Hansson   commited 2021-04-13 10:51:51 +01:00
2507c8b9c5
Merge "Make getUid a method on UserHandle itself instead of static"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-04-13 08:15:47 +00:00
4bc8b1386f
Extend framework-connectivity.impl visibility to more test
Allow captive portal tests to use hidden connectivity methods.

Bug: 182859030
Test: m
Change-Id: I2c51cbefa6d56c7ec53bacfffe735fa9d14c6510

Chiachang Wang   commited 2021-04-13 12:53:06 +08:00
dc1bfe31c4
Merge "Rename APIs in NetworkAgentConfig.Builder" am: 3cbfc11c93 am: d9feace234 am: 3633ac43f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047

Change-Id: I1988750dd4b65a3d74c33c8fc120bb3bcb705320

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-04-12 15:14:26 +00:00
9b653a7c46
Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 am: 33ec185c5e am: edd5b0f3a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788

Change-Id: I1d472c9cffaa0c7f35b284b97fa374b03232a7f4

Paul Hu   authored and   Automerger Merge Worker   commited 2021-04-12 15:13:48 +00:00
c664ed197a
Merge "Rename APIs in NetworkAgentConfig.Builder"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-04-12 14:10:46 +00:00
3cbfc11c93
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

Chiachang Wang   commited 2021-04-12 17:27:47 +08:00
3d1e89d298
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

paulhu   commited 2021-04-12 14:26:55 +08:00
7fafd1827f
Merge "Add doc for NetworkScore#getLegacyInt" into sc-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2021-04-09 04:38:09 +00:00
0ff4f9d2b7
Merge "Improve documentation on simulateDataStall" am: faf00d43b9 am: dcd39e81a6 am: 05d12ae637
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669505

Change-Id: I9484583b0249f4f67fdf6216f9ca72b900320699

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-04-09 02:36:41 +00:00
31c8eac0a0
Merge "Set ParseException constructors as public" am: 4abe99e563 am: 592ff78b65 am: 9dea9579f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669051

Change-Id: I7b744bdacf5e5929a1d0ac60832a355ebe8ce9a9

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-04-09 02:35:43 +00:00
a207a75476
Merge "Replace fields with getters in keepalive API" am: bc01e88edc am: 4c1a04c308 am: 2c5dcb4c03
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669345

Change-Id: I73f6f89eb2d1255743d10c1ec1c92770845bdd63

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-04-09 02:34:59 +00:00
2d52a9ddda
Merge "Add RequiresPermission to TestNetworkManager" am: 94c8957576 am: 2e4fce8669 am: 5780b3c45f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187

Change-Id: Ifba7b5b88e162caaf7c5393051f867655cf1b9fb

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-04-09 02:34:17 +00:00
3a6bbc2559
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

Chiachang Wang   commited 2021-04-09 08:33:07 +08:00
97565cfdb3
Merge "Improve documentation on simulateDataStall"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-04-09 00:21:34 +00:00
faf00d43b9
Merge "Set ParseException constructors as public"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-04-09 00:20:33 +00:00
4abe99e563
Merge "Replace fields with getters in keepalive API"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-04-09 00:20:13 +00:00
bc01e88edc
Merge "Add RequiresPermission to TestNetworkManager"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-04-09 00:19:51 +00:00
94c8957576
Merge "Use String in CaptivePortalData underlying types"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-04-09 00:17:59 +00:00
4e34417eec
Merge "Adding OEM Network Preferences for testing" am: 9e1bc22ce5 am: 0cc8a225ac am: 038d68cd1f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659163

Change-Id: Ia028efd68ae8ce229c5382dc4798671da9124a5b

James Mattis   authored and   Automerger Merge Worker   commited 2021-04-08 22:58:14 +00:00
cec6dac976
Merge "Adding OEM Network Preferences for testing"
James Mattis   authored and   Gerrit Code Review   commited 2021-04-08 20:51:05 +00:00
9e1bc22ce5
Add doc for NetworkScore#getLegacyInt
Test: comment-only change
Fixes: 184786246
Change-Id: I8306f01f3d247986683e272074047e3ad190f68e

Chalard Jean   commited 2021-04-08 13:52:40 +00:00
5dcbdf604a
Use String in CaptivePortalData underlying types
The venue friendly name comes from the network, and only plain strings
should be used in practice. writeCharSequence is also not usable in
CaptivePortalData, as it must build using module_api.

Use a String as the underlying type in CaptivePortalData, keeping
CharSequence in the API for consistency with UI-related elements.

This brings CaptivePortalData in line with downstream branches.

Bug: 183174863
Test: atest FrameworksNetTests
Merged-In: Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97
Change-Id: Ic662d3b546d52f825f9c3a24c5e0d4ba03818ab0

Remi NGUYEN VAN   commited 2021-04-08 08:23:20 +00:00
58df155b9d
Merge "Move ACTION_CLEAR_DNS_CACHE to ConnectivityManager" am: ed4117ff40 am: d16a01546f am: f0c991fa6f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667080

Change-Id: I5fd350d67065211b84dbea769d258daff9780276

Paul Hu   authored and   Automerger Merge Worker   commited 2021-04-08 07:48:14 +00:00
20ad372472
Improve documentation on simulateDataStall
Explain that:
 - The method does not cause an actual data stall.
 - The detectionMethod parameter refers to
   ConnectivityDiagnosticsManager.DataStallReport constants (which
   already use an IntDef).
 - timestampMillis is relative to SystemClock.elapsedRealtime.

Fixes: 183972768
Test: m
Change-Id: I2eeb79e0e8ec6e8fd3b8fe1dcb1abbf2e6338983

Remi NGUYEN VAN   commited 2021-04-08 16:30:25 +09:00
5738b86274
Add RequiresPermission to TestNetworkManager
All API methods in TestNetworkManager require the MANAGE_TEST_NETWORKS
permission.

Fixes: 183972672
Test: m
Change-Id: Ic5929c24ea88d7259d367a81fec8f223a2e3ecb0

Remi NGUYEN VAN   commited 2021-04-08 16:12:23 +09:00
6671f42bef
Set ParseException constructors as public
As there is no strong reason to keep the constructors module-lib, set
them as public API.
This is in response to API feedback.

Fixes: 183446251
Test: m
Change-Id: I01daa6f6f8095f7a4db94d1ca05f913166939df3

Remi NGUYEN VAN   commited 2021-04-08 15:57:31 +09:00
da39ab14ce
Replace fields with getters in keepalive API
General guidance is to have getters in the API instead of fields.

Fixes: 181014882
Test: m
Change-Id: Id4bfc447701e8d0380163047779fbba043f17b6f

Remi NGUYEN VAN   commited 2021-04-08 14:06:53 +09:00
029a0cff8a
Merge "Remove Network, NetworkRequest metrics from jobscheduler"
Aaron Huang   authored and   Gerrit Code Review   commited 2021-04-08 02:27:05 +00:00
77d6e7b0ba
Merge "Remove unnecessary public API getActiveNetworkForUid" into sc-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2021-04-08 02:26:15 +00:00
2630088264
Move ACTION_CLEAR_DNS_CACHE to ConnectivityManager
- As API review feedback, move ACTION_CLEAR_DNS_CACHE form Intent
  to ConnectivityManager.

- Rename to "android.net.action.CLEAR_DNS_CACHE" because of lint
  suggestion.
frameworks/base/packages/Connectivity/framework/src/android/net/
ConnectivityManager.java:449: error: Inconsistent action value;
expected `android.net.action.CLEAR_DNS_CACHE`, was
`android.intent.action.CLEAR_DNS_CACHE` [ActionValue]

Bug: 183937999
Test: atest FrameworksNetTests
Test: atest ActivityTaskManagerServiceTests
Test: atest android.permission2.cts.PermissionPolicyTest
Test: atest CtsNetTestCases
Change-Id: Iae8aa0ba10dfc7581f0cfaab82643edbee789e2f

paulhu   commited 2021-04-07 19:40:47 +08:00
164c97d0be
Merge "Expose constants of ConnectivityManager"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-04-07 10:11:06 +00:00
62967ab5d5
Expose constants of ConnectivityManager
The callers cannot call the hidden APIs after ConnectivityManager
became a part of mainline module, so expose them for callers.
Also change the value of ACTION_PROMPT_PARTIAL_CONNECTIVITY,
ACTION_PROMPT_LOST_VALIDATION and ACTION_PROMPT_UNVALIDATED because
of API lint errors.

Bug: 172183305
Test: Check private DNS settings is normal, and test NO_INTERNET
      notification can be shown normally.
Change-Id: I715c766ad8e5eb54f4dc67239c1dbca7239506fc
Merged-In: I715c766ad8e5eb54f4dc67239c1dbca7239506fc

lucaslin   authored and   Chiachang Wang   commited 2021-04-07 09:13:46 +00:00
4892f26bb8
Merge "Assign the bit calculation as long to prevent overflow" am: d125112aa2 am: 7f5c1bc46c am: 67bdf0e830
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664307

Change-Id: Ia3a1974227ebfd0069b288203df3551a561556eb

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-04-07 06:06:50 +00:00
ec27c044d3
Merge "Assign the bit calculation as long to prevent overflow"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-04-07 04:24:46 +00:00
d125112aa2
Remove Network, NetworkRequest metrics from jobscheduler
These metrics are deprecated so remove them from jobscheduler.
Also remove dumpDebug method from Network, NetworkRequest and
NetworkCapabilities because there's no caller anymore.

This change also for connectivity mainline module. These
three classes are inculded in framework-connectivity so
external module cannot have dependencies on its hidden API.
With this change, the dependencies can be removed.

(cherry-picked from ag/13959431)
Bug: 178777253
Test: FrameworksNetTests
      JobStoreTest
      adb shell dumpsys jobscheduler --proto
      CtsIncidentHostTestCases:JobSchedulerIncidentTest
Merged-In: Ie0c540303ba06b8fba029d2b98ae753afb08c963
Change-Id: Ie0c540303ba06b8fba029d2b98ae753afb08c963

Aaron Huang   commited 2021-04-07 12:22:57 +08:00
fe5e81000c
Merge "ConnectivityManager: Address review comments from aosp/1595396" am: 7fe967c611 am: 938579f701 am: dfe1a80db6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633279

Change-Id: I05777492db3ab9d7b4c6c69131f9404780e4e832

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-04-07 02:47:49 +00:00
4755f52830
Assign the bit calculation as long to prevent overflow
The value should be assigned as a long to do the bit calculation
as the mNetworkCapabilities is intended to be a long. Otherwise,
the value will be temporary assigned into an integer then
assigned to the target long. When the bit shift calculation
is out of the integer scope, the calculation will overflow and
result in unexpected bebavior.

Without assigning to a long, ConnectivityServiceTest will get
Out-Of-Memory in StringBuilder while generating toString() in
NetworkCapabilities after updating tests to verify
NET_CAPABILITY_VSIM and NET_CAPABILITY_BIP.

Bug: 130869457
Test: atest FrameworksNetTests
Change-Id: I4d34c1215c7efb6dc352c314107792e3fa512ad7

Chiachang Wang   commited 2021-04-07 02:06:33 +00:00
7dd2a3d7db
Merge "ConnectivityManager: Address review comments from aosp/1595396"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-04-07 00:36:27 +00:00
7fe967c611
Merge "NetworkCapabilities: Hide copy constructor" am: 516de2b183 am: 5a76723653 am: 2435d5a787
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151

Change-Id: Ia04c6e313a5c960c4874cd57cf91c6619d1505da

Roshan Pius   authored and   Automerger Merge Worker   commited 2021-04-06 18:25:52 +00:00
8429766378
ConnectivityManager: Address review comments from aosp/1595396
Bug: 156867433
Test: atest android.net
Test: atest com.android.server
Change-Id: I7f5d043732ae22edd14bf581b7dc676c9236b545

Roshan Pius   commited 2021-04-06 16:42:51 +00:00
f75ffaaded
Merge "NetworkCapabilities: Hide copy constructor"
Roshan Pius   authored and   Gerrit Code Review   commited 2021-04-06 15:57:47 +00:00
516de2b183
Remove unnecessary public API getActiveNetworkForUid
We have exposed the CS module API getActiveNetworkForUid
(Used in Jobscheduler) as a temporary solution for the mainline
Connectivity service module. This API usage has now been removed
in Jobscheduler(b/165835257), so we can permanently remove the
public getActiveNetworkForUid API.

Bug: 183465229
Test: atest FrameworksNetTests
Change-Id: I0f23272d2d8a5118f2e11ac325fdb9e8f9dbe0e3

lifr   commited 2021-04-06 17:39:09 +08:00
5f1c1105db
Merge "Downgrade DNS fail message from Error to Warning" am: 46b0f02e22 am: bd83b9f1d6 am: d3f719156d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662360

Change-Id: Id5a17d24b9f7bd012df60b4cf1b1d088a34805bc

Ken Chen   authored and   Automerger Merge Worker   commited 2021-04-06 07:56:55 +00:00
13598d6591