LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,167 Commits 2 Branches 0 Tags
67bdf0e83071d38544780aa657e6e5ba5d850a87
Commit Graph

13167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
a208c33fcf Merge "Adding per-app support for app add/remove" am: 922249e2bb am: 08119d7700 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633904

Change-Id: I6132b72fb299bf51a6667adcf801c9b751bf9feb
 2021-04-06 05:25:46 +00:00
Treehugger Robot
42f972825d Merge "Downgrade the log level of exception log" am: 7faee617b9 am: 1ca675172c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660002

Change-Id: I47bdd7a0c7355185372647f6f39d41c67f7a361b
 2021-04-06 05:25:11 +00:00
James Mattis
08119d7700 Merge "Adding per-app support for app add/remove" am: 922249e2bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633904

Change-Id: I8f17e1a2a7e920cb1d49fe66d06728714580ef76
 2021-04-06 04:50:32 +00:00
Treehugger Robot
1ca675172c Merge "Downgrade the log level of exception log" am: 7faee617b9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660002

Change-Id: Ic9d45e57e3ffc224670d85e4e09e02a4e134987f
 2021-04-06 04:47:21 +00:00
James Mattis
922249e2bb Merge "Adding per-app support for app add/remove" 2021-04-06 04:35:37 +00:00
Treehugger Robot
7faee617b9 Merge "Downgrade the log level of exception log" 2021-04-06 04:01:59 +00:00
Ken Chen
5d1c4661da Downgrade DNS fail message from Error to Warning 
Most DNS fails are caused by network issues, like connection timed out.
Lower log severity from error to warning to conform to go/greenlog.

Test: 1. connect to a WiFi AP without WAN
      2. atest CtsNetTestCases:android.net.cts.DnsResolverTest
      3. adb logcat | grep resNetworkResult:android
Bug: 181269159
Change-Id: Ifeaf250c91a4b9123d200bd62f085c11009f2491
 2021-04-06 02:30:56 +00:00
lucaslin
3967e5f614 Downgrade the log level of exception log 
This exception log is usually printed when the device connects to
a wifi. The cause is that when the device connects to a wifi,
wifi will send CONNECTING state first, then CONNECTED state.
And in CONNECTING state, wifi will send the LinkProperties to
ConnectivityService and ConnectivityService will try to update
that LinkProperties(including interface) to netd. But the netid
hasn't set to netd yet before wifi CONNECTED, so this exception
log will be printed.
There is no really issue in this case, so downgrade the log level
might be a better thing for all Android developer.

Bug: 181269159
Test: m
Change-Id: I61c09352225a610fcd6d3dd33b782ee114c35fc5
 2021-04-06 02:02:50 +00:00
Steven Moreland
75968dae24 Merge "Remove unstable IpPrefix" am: 3f6415a2f5 am: 2babf25cf0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662674

Change-Id: I41d891c9a4e0c3c0c42fcc425ea5230d23dbb86e
 2021-04-05 23:19:09 +00:00
Steven Moreland
2babf25cf0 Merge "Remove unstable IpPrefix" am: 3f6415a2f5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662674

Change-Id: I7517ae6cefa96ee3ca38fbcca36970677cb6469b
 2021-04-05 22:37:44 +00:00
Steven Moreland
3f6415a2f5 Merge "Remove unstable IpPrefix" 2021-04-05 21:59:47 +00:00
James Mattis
bd275dcf3d Adding per-app support for app add/remove 
Adding support for per-app network functionality to react to application
installs, removals and updates. Also, opportunistic cleanup of a couple
annotations.

Bug: 177092163
Bug: 176494815
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I45acbd0d2ef50d575f14a944ce82b185ed69f219
 2021-04-05 09:55:44 -07:00
Roshan Pius
f458be1093 NetworkCapabilities: Hide copy constructor 
Only used by connectivity service, no need to mark it public.

Bug: 184537591
Test: Compiles
Change-Id: Ie0d515d73e30a4e15141a3d92aa739192badeb13
 2021-04-05 09:29:30 -07:00
Treehugger Robot
adef15dabb Merge "Fix broken testCaptivePortalApp" am: 5110c6dad6 am: 0fa2dde613 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659999

Change-Id: Iaebc7427cafaf77c025885f2ac317cbead21b068
 2021-04-05 14:24:03 +00:00
Treehugger Robot
0fa2dde613 Merge "Fix broken testCaptivePortalApp" am: 5110c6dad6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659999

Change-Id: I7a77b050fd844f76e4f7aafa319017382ac06602
 2021-04-05 13:44:51 +00:00
Treehugger Robot
5110c6dad6 Merge "Fix broken testCaptivePortalApp" 2021-04-05 13:05:41 +00:00
Chalard Jean
1bc19cb6a9 Merge "Fix a bug where the wrong profile is queried" am: 167cc4a044 am: 92bbfaf0a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662362

Change-Id: I314686498e3412866e6e17fc2d4377523007589f
 2021-04-05 07:20:07 +00:00
Chalard Jean
92bbfaf0a2 Merge "Fix a bug where the wrong profile is queried" am: 167cc4a044 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662362

Change-Id: Id60b4897a749136010f00d5ede018991b54c7b70
 2021-04-05 06:35:20 +00:00
Chalard Jean
167cc4a044 Merge "Fix a bug where the wrong profile is queried" 2021-04-05 05:48:17 +00:00
Benedict Wong
01001e2ddf Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi" am: 87e0ab8905 am: d5af88a835 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652974

Change-Id: Ib714d9a03e5b5152a576330711a8894178db4a95
 2021-04-03 01:15:50 +00:00
Benedict Wong
d5af88a835 Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi" am: 87e0ab8905 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652974

Change-Id: I4dc51bf65af853a7510586169caa12b083c2f94b
 2021-04-02 23:10:21 +00:00
Benedict Wong
87e0ab8905 Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi" 2021-04-02 22:33:20 +00:00
Sarah Chin
b50ae931f1 Merge "API to get network visible network capability name" am: 129857619f am: 7d29a97aa8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653200

Change-Id: Ia6c65d6cd6d322d5599942ec65323a0d62e4dd1b
 2021-04-02 17:56:48 +00:00
Sarah Chin
7d29a97aa8 Merge "API to get network visible network capability name" am: 129857619f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653200

Change-Id: I7f8b909ec061d8bb875ff2688e2fb9a4cea54318
 2021-04-02 17:45:29 +00:00
Sarah Chin
129857619f Merge "API to get network visible network capability name" 2021-04-02 16:50:10 +00:00
Chalard Jean
aac3b872ea Cleanup setGlobalProxy 
This is a small cleanup of a function called by DevicePolicyManager
coming from a conflicting change. This no longer makes a concrete
difference but is still a good change.

Test: m services.devicepolicy
Bug: 172183305
Change-Id: I7ee907314ddb253eb4e97d177f0ea0ab3b58cf03
 2021-04-02 20:37:21 +09:00
Chalard Jean
70b2d9ac2f Fix broken testCaptivePortalApp 
This was broken by aosp/1657763, only on eng builds because
of a wtf. The root cause of the issue is that the test is
acquiring MAINLINE_NETWORK_STACK after it registers a callback
but before in unregisters it. After aosp/1657763, the objects
keeping track of callbacks are separate for processes with and
without MAINLINE_NETWORK_STACK, which means the removal is
looked up in a different counter.

Solve this by having the NRI remember the relevant counter
keeping track of it.

Bug: none
Test: testCaptivePortalApp
Change-Id: I566a28522fa68be9cc2bdb4624b588b4f01d3b7e
 2021-04-02 20:18:18 +09:00
Chalard Jean
0a04bdb730 Fix a bug where the wrong profile is queried 
UserManager#isManagedProfile() is not aware of the user
handle of the context the UM instance is created on.
Instead, call isManagedProfile(int).

Bug: 183625645
Test: ConnectivityServiceTest
Change-Id: I1fef22d67d75df25a8c2d0694f857c3e1c1a1306
 2021-04-02 19:24:44 +09:00
Benedict Wong
4310e45eff Downgrade list of subIds in NetworkCapabilities to @SystemApi 
This change downgrades API visibility for the list-of-subIds in the
NetworkCapabilities to SystemApi

Bug: 175662146
Test: atest NetworkCapabilitiesTest#testSubIds
Test: atest FrameworksNetTests
Change-Id: I372fa9eaa7585aefd1710948ca007456feedd578
 2021-04-02 01:18:11 -07:00
Steven Moreland
0fb772f6df Remove unstable IpPrefix 
Seems nothing is using this.

Bug: 183654927
Test: N/A
Change-Id: I94233d79fb5d93970b38a79a09fc4d50822c3620
 2021-04-01 22:59:02 +00:00