Chalard Jean
b82479fa55
Use filter from CollectionUtils.
...
Test: ConnectivityServiceTest
Fixes: 184826320
Change-Id: Iae8df6058c0a43fba1e6ebcd6003df54751f9646
2021-04-08 21:23:48 +09:00
Aaron Huang
e0869fbce4
[automerger skipped] Merge "Remove Network, NetworkRequest metrics from jobscheduler" am: 77d6e7b0ba am: 9b87bcb32d am: 85d1e0a6e1 -s ours
...
am skip reason: skip tag Change-Id Ie0c540303ba06b8fba029d2b98ae753afb08c963 with SHA-1 f668c3b2b2 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666841
Change-Id: I5d2e532792b6abf0c35968f136c16a418ad2b380
2021-04-08 07:56:06 +00:00
Paul Hu
20ad372472
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
2021-04-08 07:48:14 +00:00
Aaron Huang
85d1e0a6e1
Merge "Remove Network, NetworkRequest metrics from jobscheduler" am: 77d6e7b0ba am: 9b87bcb32d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666841
Change-Id: Ie3d8de6a1df69231367c8d476a158070d21f7f91
2021-04-08 03:00:27 +00:00
Aaron Huang
9b87bcb32d
Merge "Remove Network, NetworkRequest metrics from jobscheduler" am: 77d6e7b0ba
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666841
Change-Id: I3770e6f3b146c47fa5b20dcd09e2bbd0fd69cbdf
2021-04-08 02:43:55 +00:00
Paul Hu
f0c991fa6f
Merge "Move ACTION_CLEAR_DNS_CACHE to ConnectivityManager" am: ed4117ff40 am: d16a01546f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667080
Change-Id: Ice9b0d027e7e4f00bc9f14eb075ead9e77eaeca7
2021-04-08 02:37:23 +00:00
Aaron Huang
77d6e7b0ba
Merge "Remove Network, NetworkRequest metrics from jobscheduler"
2021-04-08 02:27:05 +00:00
TreeHugger Robot
2630088264
Merge "Remove unnecessary public API getActiveNetworkForUid" into sc-dev
2021-04-08 02:26:15 +00:00
Paul Hu
d16a01546f
Merge "Move ACTION_CLEAR_DNS_CACHE to ConnectivityManager" am: ed4117ff40
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667080
Change-Id: I4f180fc6e083b21d089dc15881e89a021557635a
2021-04-08 01:56:44 +00:00
Treehugger Robot
eec974b788
[automerger skipped] Merge "Expose constants of ConnectivityManager" am: 62967ab5d5 am: cf22e5a521 am: f0b8f3dc98 -s ours
...
am skip reason: skip tag Change-Id I715c766ad8e5eb54f4dc67239c1dbca7239506fc with SHA-1 1a0ca5f171 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579805
Change-Id: I998cf20b3f54ccdfadf46e64ee655858e3534097
2021-04-07 12:06:15 +00:00
paulhu
164c97d0be
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
2021-04-07 19:40:47 +08:00
Treehugger Robot
f0b8f3dc98
Merge "Expose constants of ConnectivityManager" am: 62967ab5d5 am: cf22e5a521
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579805
Change-Id: Ibd12c85a42d9b0c13113923c3a61dde7f2cd3e5a
2021-04-07 11:25:59 +00:00
Treehugger Robot
cf22e5a521
Merge "Expose constants of ConnectivityManager" am: 62967ab5d5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579805
Change-Id: I0e3930444640a8bff7b0f9846cd2ce0e92df8d6f
2021-04-07 10:42:47 +00:00
Treehugger Robot
62967ab5d5
Merge "Expose constants of ConnectivityManager"
2021-04-07 10:11:06 +00:00
lucaslin
4892f26bb8
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
2021-04-07 09:13:46 +00:00
Treehugger Robot
e54dd7b837
Merge "Split networkDestroy() and destroyNetworkCache()" am: a544e4b417 am: d9002eac4f am: 6bcd3d1a25
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554020
Change-Id: I40eb6f8d8ea6924b05da34352dbc9192caa4b82e
2021-04-07 06:07:32 +00:00
Chiachang Wang
ec27c044d3
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
2021-04-07 06:06:50 +00:00
Treehugger Robot
6bcd3d1a25
Merge "Split networkDestroy() and destroyNetworkCache()" am: a544e4b417 am: d9002eac4f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554020
Change-Id: Ibe4408e7eb1b23abe0ff8e92b06d4a04f26962de
2021-04-07 06:01:13 +00:00
Treehugger Robot
d9002eac4f
Merge "Split networkDestroy() and destroyNetworkCache()" am: a544e4b417
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554020
Change-Id: I517e242589fa979826c65817d5918ce05ced9866
2021-04-07 05:40:17 +00:00
Chiachang Wang
67bdf0e830
Merge "Assign the bit calculation as long to prevent overflow" am: d125112aa2 am: 7f5c1bc46c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664307
Change-Id: I68844967fbef3cffb7211ce72fd502ae19c331c8
2021-04-07 05:39:01 +00:00
Treehugger Robot
a544e4b417
Merge "Split networkDestroy() and destroyNetworkCache()"
2021-04-07 05:05:46 +00:00
Chiachang Wang
7f5c1bc46c
Merge "Assign the bit calculation as long to prevent overflow" am: d125112aa2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664307
Change-Id: I548347851e102f81cd13516a6a409e74c59859f4
2021-04-07 04:56:41 +00:00
Chiachang Wang
d125112aa2
Merge "Assign the bit calculation as long to prevent overflow"
2021-04-07 04:24:46 +00:00
Aaron Huang
fe5e81000c
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
2021-04-07 12:22:57 +08:00
Treehugger Robot
4755f52830
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
2021-04-07 02:47:49 +00:00
Chiachang Wang
7dd2a3d7db
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
2021-04-07 02:06:33 +00:00
Treehugger Robot
dfe1a80db6
Merge "ConnectivityManager: Address review comments from aosp/1595396" am: 7fe967c611 am: 938579f701
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633279
Change-Id: I9fe5fb1cbbbae44e91efe90107c220a7b64d9755
2021-04-07 02:00:09 +00:00
Treehugger Robot
938579f701
Merge "ConnectivityManager: Address review comments from aosp/1595396" am: 7fe967c611
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633279
Change-Id: I6653d668d1fdc4370f8d5db1da41214b9755bb4d
2021-04-07 01:16:24 +00:00
Treehugger Robot
7fe967c611
Merge "ConnectivityManager: Address review comments from aosp/1595396"
2021-04-07 00:36:27 +00:00
Roshan Pius
8429766378
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
2021-04-06 18:25:52 +00:00
Roshan Pius
2435d5a787
Merge "NetworkCapabilities: Hide copy constructor" am: 516de2b183 am: 5a76723653
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151
Change-Id: If4d2d06c0e3ca6793dcb6139d3cd197e33f5aab7
2021-04-06 17:36:58 +00:00
Roshan Pius
5a76723653
Merge "NetworkCapabilities: Hide copy constructor" am: 516de2b183
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151
Change-Id: I4e3b8ca8158102bf71b6ab2ca796bdfeeedd7d55
2021-04-06 16:49:29 +00:00
Roshan Pius
f75ffaaded
ConnectivityManager: Address review comments from aosp/1595396
...
Bug: 156867433
Test: atest android.net
Test: atest com.android.server
Change-Id: I7f5d043732ae22edd14bf581b7dc676c9236b545
2021-04-06 16:42:51 +00:00
Roshan Pius
516de2b183
Merge "NetworkCapabilities: Hide copy constructor"
2021-04-06 15:57:47 +00:00
lifr
5f1c1105db
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
2021-04-06 17:39:09 +08:00
Lucas Lin
ec0c39f789
Merge "Ignore checking TRANSPORT_USB when Android version is older than S" into sc-dev
2021-04-06 08:40:23 +00:00
Frank Li
5d3ca7b19c
[automerger skipped] Merge "Add session ID to VpnTransportInfo" am: 133733bdd2 am: dc50757d4d am: 537e4415b1 -s ours
...
am skip reason: skip tag Change-Id I8d09e25b83f7ee8be21ec9c9bd3c72a251f1370d with SHA-1 5acb6b6d4e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652218
Change-Id: Idcdd09ad0e7c11482dc048dd30f4a72a7e294b2f
2021-04-06 07:57:52 +00:00
Ken Chen
13598d6591
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
2021-04-06 07:56:55 +00:00
Chalard Jean
50da27813b
Merge "Cleanup setGlobalProxy" am: 0656c4314c am: 42fbe21e61 am: 53f5943e4e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640148
Change-Id: Ic9757060f398aaf871141dc5199bf49988637937
2021-04-06 07:55:54 +00:00
Frank Li
537e4415b1
Merge "Add session ID to VpnTransportInfo" am: 133733bdd2 am: dc50757d4d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652218
Change-Id: I554a86b2445f0449e5556871f553158dff19e192
2021-04-06 07:35:06 +00:00
Ken Chen
d3f719156d
Merge "Downgrade DNS fail message from Error to Warning" am: 46b0f02e22 am: bd83b9f1d6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662360
Change-Id: Id681bbbafa73df18cc49d0dd03caeb37fcd99b7e
2021-04-06 07:33:32 +00:00
Chalard Jean
53f5943e4e
Merge "Cleanup setGlobalProxy" am: 0656c4314c am: 42fbe21e61
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640148
Change-Id: I0a8d51af2280d47f3924f66d56e529f57057b3bb
2021-04-06 07:30:44 +00:00
Frank Li
dc50757d4d
Merge "Add session ID to VpnTransportInfo" am: 133733bdd2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652218
Change-Id: I736118ea676708ef6630d2153a3986459b31850c
2021-04-06 07:01:12 +00:00
Ken Chen
bd83b9f1d6
Merge "Downgrade DNS fail message from Error to Warning" am: 46b0f02e22
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662360
Change-Id: Ife7da1c0494d24e140ea9fdc64f7018340cc3e40
2021-04-06 06:55:39 +00:00
Frank Li
133733bdd2
Merge "Add session ID to VpnTransportInfo"
2021-04-06 06:50:48 +00:00
Chalard Jean
42fbe21e61
Merge "Cleanup setGlobalProxy" am: 0656c4314c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640148
Change-Id: I0052f30d52f00f40b933eb1573b1a0de37e9cba2
2021-04-06 06:50:15 +00:00
Ken Chen
46b0f02e22
Merge "Downgrade DNS fail message from Error to Warning"
2021-04-06 06:35:04 +00:00
Chalard Jean
0656c4314c
Merge "Cleanup setGlobalProxy"
2021-04-06 06:19:01 +00:00
James Mattis
eac282f62e
Merge "Adding per-app support for app add/remove" am: 922249e2bb am: 08119d7700 am: a208c33fcf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633904
Change-Id: I72d9981b2a6febc218c30926e58072f43e8bf0a5
2021-04-06 06:12:06 +00:00
Treehugger Robot
5ecb359fea
Merge "Downgrade the log level of exception log" am: 7faee617b9 am: 1ca675172c am: 42f972825d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660002
Change-Id: I5ab24f6bc5d9e52aeb78c9464bffe8d51bf5c70e
2021-04-06 06:11:29 +00:00