LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,639 Commits 2 Branches 0 Tags
36bc36926033b2bf3fc707e7cfd3cc5b5e2dff37
Commit Graph

12639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
36bc369260 Merge "Enforce that NetworkAgentInfo fields are never null." am: 3a6e50bdb9 am: c000462ea0 am: f8a9b5c78e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553734

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If07ff3b1b8dd2d6245cc38c8d25423da5392b6ae
 2021-01-18 11:49:08 +00:00
Treehugger Robot
f8a9b5c78e Merge "Enforce that NetworkAgentInfo fields are never null." am: 3a6e50bdb9 am: c000462ea0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553734

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56dc3dc6daafa2123f8f1fc40007cd52a4f7a21c
 2021-01-18 11:24:56 +00:00
Treehugger Robot
c000462ea0 Merge "Enforce that NetworkAgentInfo fields are never null." am: 3a6e50bdb9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553734

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12eba91f29b55b7162889e1d44de15580f839195
 2021-01-18 10:24:27 +00:00
Treehugger Robot
3a6e50bdb9 Merge "Enforce that NetworkAgentInfo fields are never null." 2021-01-18 09:32:39 +00:00
Lorenzo Colitti
83d065696f Enforce that NetworkAgentInfo fields are never null. 
These fields have been recently audited, confirmed never to be
null, and annotated @NonNull. Ensure that they can never become
null by throwing exceptions in the codepaths that set them.
Also remove some null checks.

Test: atest FrameworksNetTests
Change-Id: I6ce5bb4d69a990f1c857c599b7e50e372352eb87
 2021-01-18 07:49:26 +00:00
Lorenzo Colitti
82a1e88bc3 Merge "Mark several NetworkAgentInfo members @NonNull and address TODO." am: f49e1b0c6c am: d9df019897 am: cc615e48ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d6b833342292026f5f0a91a96006ece31762b9a
 2021-01-18 07:20:11 +00:00
Lorenzo Colitti
cc615e48ce Merge "Mark several NetworkAgentInfo members @NonNull and address TODO." am: f49e1b0c6c am: d9df019897 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07fa9035369c8abde6de395b21630b239bdd4247
 2021-01-18 07:06:06 +00:00
Lorenzo Colitti
d9df019897 Merge "Mark several NetworkAgentInfo members @NonNull and address TODO." am: f49e1b0c6c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I904873d1998948ef58e6179a78c5d87834fa7c86
 2021-01-18 06:33:36 +00:00
Paul Hu
bfd5f4ea02 Merge "Remove unused IpConnectivityMetrics in CS" am: 671085fbde am: 22a26d0918 am: c2115c380e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bac9e17a3584df017a83472a58c6353bdef845b
 2021-01-18 06:33:17 +00:00
Paul Hu
c2115c380e Merge "Remove unused IpConnectivityMetrics in CS" am: 671085fbde am: 22a26d0918 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64b20b343515f641146780ca9b9ec7bfb4ac586a
 2021-01-18 06:05:12 +00:00
Lorenzo Colitti
f49e1b0c6c Merge "Mark several NetworkAgentInfo members @NonNull and address TODO." 2021-01-18 05:51:38 +00:00
Paul Hu
22a26d0918 Merge "Remove unused IpConnectivityMetrics in CS" am: 671085fbde 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If123fae795475433f61f9264f0a2e3b51676056c
 2021-01-18 05:45:22 +00:00
Paul Hu
671085fbde Merge "Remove unused IpConnectivityMetrics in CS" 2021-01-18 05:26:35 +00:00
paulhu
a1b4fbe5a0 Remove unused IpConnectivityMetrics in CS 
ConnectivityService doesn't call any IpConnectivityMetrics
methods, so remove all usages from CS.

Bug: 177656797
Test: atest FrameworksNetTests
Test: atest FrameworksNetIntegrationTests
Change-Id: I2fb3b6b08cd8013eb8f75882f77ca699a2df927e
 2021-01-18 04:03:32 +00:00
Chiachang Wang
a26c02f27a Merge "Replace hidden ParcelFileDescriptor constructor usage" am: b60805b832 am: bddce89449 am: 263b7e551f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38369186c581fcde3e21c91af6b35ccd88320509
 2021-01-18 03:27:17 +00:00
Roshan Pius
8b48fa3ff4 Merge "LocationPermissionChecker: Exempt privileged components from location check" am: fdc3167044 am: 56b8d48921 am: 5573b0c726 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550515

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66afba490765f4eae803d0ea4e2cc3eb54528aa4
 2021-01-18 03:24:51 +00:00
Chiachang Wang
263b7e551f Merge "Replace hidden ParcelFileDescriptor constructor usage" am: b60805b832 am: bddce89449 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09ac624ffc3f5bf4e14a1997f966ad444751517e
 2021-01-18 02:53:04 +00:00
Roshan Pius
5573b0c726 Merge "LocationPermissionChecker: Exempt privileged components from location check" am: fdc3167044 am: 56b8d48921 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550515

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45afdaba68269d59cfcf670ef7fdef6a19b3a9d2
 2021-01-18 02:52:29 +00:00
Chiachang Wang
bddce89449 Merge "Replace hidden ParcelFileDescriptor constructor usage" am: b60805b832 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3dcae7bce2b8168bff86cfccc7ce83d17d61006
 2021-01-18 02:28:04 +00:00
Roshan Pius
56b8d48921 Merge "LocationPermissionChecker: Exempt privileged components from location check" am: fdc3167044 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550515

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4af673a7be59c0382f68fc53f1b2704746f53cc3
 2021-01-18 02:25:39 +00:00
Chiachang Wang
b60805b832 Merge "Replace hidden ParcelFileDescriptor constructor usage" 2021-01-18 01:59:10 +00:00
Chiachang Wang
c5f86f48b0 Replace hidden ParcelFileDescriptor constructor usage 
If IOException happens while trying to start keepalives sockets,
an invalid fd will be constructed. It will fail with
ERROR_INVALID_SOCKET if the user later calls start(). Current
design to construct the invalid fd use the hidden
ParcelFileDescriptor constructor which will not work for the
incoming ConnectivityService mainline. Thus, replace it with
the other formal API.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I57fd7ec2281c5e8c75481200bbde723ecf96982a
 2021-01-18 01:58:49 +00:00
Roshan Pius
fdc3167044 Merge "LocationPermissionChecker: Exempt privileged components from location check" 2021-01-18 01:33:31 +00:00
Junyu Lai
d55721db90 Merge "[VCN05.1] Add unit test for invalid request types" am: 3157c3642a am: 70e6084cfd am: b4e3dc2428 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552495

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0ac3fcc869664fa3465a02b2aaa1a03f65e363d
 2021-01-16 04:13:10 +00:00
Junyu Lai
b4e3dc2428 Merge "[VCN05.1] Add unit test for invalid request types" am: 3157c3642a am: 70e6084cfd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552495

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I583ea313daf34eda827672ae549554b8c82f345f
 2021-01-16 03:48:51 +00:00
Junyu Lai
70e6084cfd Merge "[VCN05.1] Add unit test for invalid request types" am: 3157c3642a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552495

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8af28178d6aca1d90b7c93808a41dee0f80b018
 2021-01-16 02:34:13 +00:00
Junyu Lai
3157c3642a Merge "[VCN05.1] Add unit test for invalid request types" 2021-01-16 02:27:28 +00:00
Lorenzo Colitti
131d7c1cbc Mark several NetworkAgentInfo members @NonNull and address TODO. 
1. network cannot be null because it's final and the only caller
   of the constructor passes in a fresh copy.
2. linkProperties cannot be null because:
   - The only caller of the constructor passes in a fresh copy.
   - The only assignment to nai.linkProperties is in
     updateLinkProperties, and that dereferences newLp a few
     lines before assigning it.
3. networkCapabilities cannot be null because:
   - The only caller of the constructor passes in a fresh copy.
   - There are no direct assignments to nai.networkCapabilities.
   - All 4 assignments happen via getAndSetNetworkCapabilities:
     - registerNetworkAgentInternal, updateCapabilities and
       applyBackgroundChangeForRematch all pass in the return
       value of mixInCapabilities, which is always non-null.
     - updateNetworkInfo re-assigns the capabilities that were
       already set in the object.
4. networkAgentConfig cannot be null because it's final and
   the only caller of the NetworkAgentInfo constructor passes
   in a fresh copy.

Address a TODO in ConnectivityService to remove a check for the
nai's capabilities being null.

Also fix a style nit pointed out by the linter.

Test: atest FrameworksNetTests
Change-Id: I2e265f1c60a73d6da0222dd6711bc53c32db06ec
 2021-01-16 00:56:44 +09:00
Roshan Pius
854f6a6269 LocationPermissionChecker: Exempt privileged components from location check 
This is a port of the exemption that exists in WifiPermissionsUtil.
Settings, sysui, network stack needs to be able to access all network
state regardless of location toggle. If we want to move sysui, etc to
retrieve WifiInfo via NetworkCapabilities (which is the current plan),
this exemption is essential since UI should reflect wifi state
regardless of location toggle state.

Bug: 162602799
Test: atest LocationPermissionCheckerTest
Change-Id: I49ce465eccce27bb7a860d882360436fd9ec19c6
 2021-01-15 06:51:39 -08:00
Aaron Huang
1952a90711 Merge "Refactor setCurrentProxyScriptUrl to a void method" am: 25dc7661a2 am: d96402f598 am: de29708e21 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513131

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I357e0f8a50b2619241f5edc4c3e0fdf3049f232f
 2021-01-15 14:08:46 +00:00
Treehugger Robot
be9f28d7c8 Merge "Fix CaptivePortalDataTest on R-" am: 116341a9ef am: 9e954646a4 am: 6cb0cf0a33 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550715

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45d764225af2857caa13e3ea0af660757c519f0f
 2021-01-15 14:06:33 +00:00
James Mattis
331a21f3ae Merge "Waiting for idle in test" am: 17ac644470 am: fadb5494f1 am: 85a9a2f7ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550420

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7ef4eedc0982640b4923885b2deeaefc8081db9
 2021-01-15 14:04:42 +00:00
Roshan Pius
420441dd7d [automerger skipped] Merge "NetworkCapabilities: Embed location senstive TransportInfo" am: 7cdb30ec22 am: efe287deb1 am: 110d94fc84 -s ours 
am skip reason: Change-Id Ie522d8c75a82ae521ccfd5165823d0c72642e651 with SHA-1 e9c34f86cb is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508602

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7ace3cc9124b36ddc62306373442d724c3682d8
 2021-01-15 13:57:26 +00:00
Lorenzo Colitti
6b00150524 Merge changes I28e39400,Ibada8b42 am: a34c401619 am: 6c1a0bbf28 am: c65cf828d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548870

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86031cca3685b4e0d2d48d9e339cf1a314f42b3c
 2021-01-15 13:55:46 +00:00
junyulai
12cf8caa46 [VCN05.1] Add unit test for invalid request types 
Test: atest ConnectivityServiceTest#testInvalidRequestTypes
Bug: 175662146
Change-Id: I595b0bd1cfb88724581f67942cd3891f95c157ab
 2021-01-15 21:19:49 +08:00
Aaron Huang
de29708e21 Merge "Refactor setCurrentProxyScriptUrl to a void method" am: 25dc7661a2 am: d96402f598 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513131

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe8db1aa61ad9aea6719531634ef8a5d97197d8e
 2021-01-15 11:12:03 +00:00
Lorenzo Colitti
865c72aabb Improve testing of CONNECTIVITY_ACTION broadcasts. 
We currently test CONNECTIVITY_ACTION broadcasts by directly
registering BroadcastReceivers with BroadcastInterceptingContext,
and making the receivers unregister themselves when all the
broadcasts they expect have been received.

This works for current test cases, but does not work if anything
registers another receiver for CONNECTIVITY_ACTION. In that case,
when we unregister the receiver in the receiver's onReceive
method, BroadcastInterceptingContext will throw a
ConcurrentModificationException because the list of receivers is
being modified during iteration.

Fix this by adding an ExpectedBroadcast class that stores the
receiver and unregisters the receiver only when the test checks
that the broadcast was received, which happens after the receiver
runs. This is easier to use and also guarantees that the receiver
is unregistered even if the test is expecting that the broadcast
is never fired. Accordingly, remove mRegisteredReceivers and the
code that uses it; it's no longer necessary now that
ExpectedBroadcast always unregisters its receivers.

Also add a convenience expectConnectivityAction method to expect
a CONNECTIVITY_ACTION broadcast with specific contents. This
makes the test easier to read and more detailed. Convert some
existing tests to this method.

While I'm at it, fix a test that was using "mCellNetworkAgent" to
represent a wifi network.

Bug: 173331190
Test: test-only change
Change-Id: Ibada8b4215625e1016d9fd170526206920af76f5
 2021-01-15 20:04:57 +09:00
Aaron Huang
d96402f598 Merge "Refactor setCurrentProxyScriptUrl to a void method" am: 25dc7661a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513131

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24bb3882c467aa590e37e858df875825221c88a0
 2021-01-15 10:19:58 +00:00
Aaron Huang
25dc7661a2 Merge "Refactor setCurrentProxyScriptUrl to a void method" 2021-01-15 10:01:10 +00:00
Treehugger Robot
6cb0cf0a33 Merge "Fix CaptivePortalDataTest on R-" am: 116341a9ef am: 9e954646a4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550715

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b27d1f6924406ee7466c5c2316240d11f819a6b
 2021-01-15 07:10:31 +00:00
Treehugger Robot
9e954646a4 Merge "Fix CaptivePortalDataTest on R-" am: 116341a9ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550715

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie16759138fd84a46bf7d3d30c3a254b2ee72264a
 2021-01-15 06:20:18 +00:00
Treehugger Robot
116341a9ef Merge "Fix CaptivePortalDataTest on R-" 2021-01-15 05:26:34 +00:00
James Mattis
85a9a2f7ef Merge "Waiting for idle in test" am: 17ac644470 am: fadb5494f1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550420

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8f1d47d40942fb30f27d5f2a884a52778efddc7
 2021-01-15 02:14:13 +00:00
James Mattis
fadb5494f1 Merge "Waiting for idle in test" am: 17ac644470 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550420

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia335a4fedabed9eed6465d08e5ea882c259539e1
 2021-01-15 01:52:16 +00:00
Remi NGUYEN VAN
054800f23a Fix CaptivePortalDataTest on R- 
The new venue friendly name field is not present on R-

Bug: 162783305
Change-Id: I63bd9c61d27c7d3b07826053373c9c5e38666948
Test: atest FrameworksNetTests
 2021-01-15 01:13:27 +00:00
James Mattis
17ac644470 Merge "Waiting for idle in test" 2021-01-15 00:28:54 +00:00
Roshan Pius
110d94fc84 Merge "NetworkCapabilities: Embed location senstive TransportInfo" am: 7cdb30ec22 am: efe287deb1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508602

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a05f4bdc39508692c62ad49f7e769d244aaafcb
 2021-01-14 17:01:24 +00:00
Roshan Pius
efe287deb1 Merge "NetworkCapabilities: Embed location senstive TransportInfo" am: 7cdb30ec22 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508602

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie88978197172519e6bd26182e1d24178769b3741
 2021-01-14 16:08:04 +00:00
Roshan Pius
7cdb30ec22 Merge "NetworkCapabilities: Embed location senstive TransportInfo" 2021-01-14 15:38:15 +00:00
Lorenzo Colitti
c65cf828d8 Merge changes I28e39400,Ibada8b42 am: a34c401619 am: 6c1a0bbf28 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548870

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a086ef5602d1823ca582894f8fddd138ce6080c
 2021-01-14 11:34:15 +00:00