LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,848 Commits 2 Branches 0 Tags
b4e3dc2428dc31fd5795173c081210d00e5c69bc
Commit Graph

11848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Lorenzo Colitti
6c1a0bbf28 Merge changes I28e39400,Ibada8b42 am: a34c401619 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548870

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59bcae23f71d57715845b1f613c0733a04725763
 2021-01-14 11:00:43 +00:00
Lorenzo Colitti
a34c401619 Merge changes I28e39400,Ibada8b42 
* changes:
  UserManager restricted profile SystemApis
  Improve testing of CONNECTIVITY_ACTION broadcasts.
 2021-01-14 10:39:48 +00:00
Aaron Huang
644892e3cb Merge "Migrate Slog usage in MultinetworkPolicyTracker to Log" am: 3637b6d0bf am: 8754a60bb9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549720

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide31b81db2a41c4ea60783195bff3d9bb8ff5440
 2021-01-14 09:39:26 +00:00
Aaron Huang
8754a60bb9 Merge "Migrate Slog usage in MultinetworkPolicyTracker to Log" am: 3637b6d0bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549720

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id726928bd9363d01de8aaafd19e07db8498897c7
 2021-01-14 09:23:25 +00:00
Aaron Huang
3637b6d0bf Merge "Migrate Slog usage in MultinetworkPolicyTracker to Log" 2021-01-14 09:10:17 +00:00
Adam Bookatz
283e061fba UserManager restricted profile SystemApis 
Makes two new SystemApis:
getRestrictedProfileParent()
canHaveRestrictedProfile()

Temporarily disables VPN Tests that rely on the old APIs until those
tests are updated (b/175883995).

Bug: 171529940
Test: atest FrameworksNetTests:com.android.server.connectivity.VpnTest
Test: Tests for UserManager SystemApis are TODO awaiting completion of new user test infrastructure (b/163890431)
(cherry picked from commit dde2e9e897)
Change-Id: I28e39400039631e7d391dc7b0d003e8a38d1f06a
 2021-01-14 17:39:13 +09:00
Junyu Lai
53f3094fb0 Merge "[VCN05] Pass request type when requesting network" am: 8188af4521 am: b728deeb7f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545846

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If712966563911065873c8933557921a20c9dca0e
 2021-01-14 08:17:00 +00:00
Lorenzo Colitti
a39f357fb0 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-14 17:11:28 +09:00
Junyu Lai
b728deeb7f Merge "[VCN05] Pass request type when requesting network" am: 8188af4521 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545846

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f617b172ca17748b6e6be0afbf3474b5629dec7
 2021-01-14 07:43:35 +00:00
Junyu Lai
8188af4521 Merge "[VCN05] Pass request type when requesting network" 2021-01-14 06:52:46 +00:00
Aaron Huang
2a89cb3753 Merge "Rename PacManager to PacProxyInstaller" am: 8505c870cd am: 51203ec517 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513130

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad81d2612d16585134028fea71cbab2f1fb13610
 2021-01-14 04:22:40 +00:00
Aaron Huang
28fd7803b0 Refactor setCurrentProxyScriptUrl to a void method 
setCurrentProxyScriptUrl is used by ProxyTracker which is
included in connectivity service mainline module. To make
this method @SystemApi in follow-up patch, change this
from a boolean method to a void method. Moving the send or
not send broadcast logic to caller because it can know
whether it needs to send a broadcast or not.

Bug: 177035719
Test: FrameworksNetTests
Change-Id: I7c0fd20bb449463a65952cfa9fb8a42310da079c
 2021-01-14 12:19:26 +08:00
Aaron Huang
51203ec517 Merge "Rename PacManager to PacProxyInstaller" am: 8505c870cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513130

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf8192ca563275048acccbf6163f7effc4b04781
 2021-01-14 01:54:51 +00:00
Aaron Huang
fc52b82254 Migrate Slog usage in MultinetworkPolicyTracker to Log 
Connectivity mainline module cannot use hidden API so
replace Slog with Log which is a public API.

Test: FrameworksNetTests
Change-Id: I8758079cf635ff4ab218df53c0f7bf6fc23ce476
 2021-01-14 09:53:38 +08:00
Aaron Huang
8505c870cd Merge "Rename PacManager to PacProxyInstaller" 2021-01-14 01:52:24 +00:00
James Mattis
3e1eddeab7 Waiting for idle in test 
Waiting for idle in testRequestsSortedByIdSortsCorrectly to give it time
to handle async operations as part of registering network callbacks.

Bug: 177376544
Test: atest FrameworksNetTests:ConnectivityServiceTest#
testRequestsSortedByIdSortsCorrectly --rerun-until-failure 200

Change-Id: I268c4607d1a4c79e79f1385f014563cea0c2f979
 2021-01-13 13:56:50 -08:00
satayev
b8cf9e427b Merge "Revert "[VCN01] Add NOT_VCN_MANAGED capability"" am: ca95071a98 am: f9253eefae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0fd366c8ae249072d32fafc6d70e4dc995ad7ae
 2021-01-13 18:52:27 +00:00
satayev
f9253eefae Merge "Revert "[VCN01] Add NOT_VCN_MANAGED capability"" am: ca95071a98 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03dade86df57e4728eea88ab9b148251a1097c85
 2021-01-13 18:32:31 +00:00
satayev
ca95071a98 Merge "Revert "[VCN01] Add NOT_VCN_MANAGED capability"" 2021-01-13 17:40:03 +00:00
Lorenzo Colitti
3a2ccd59dd Merge "Stop using VPNs in getActiveNetworkForUidInternal." am: c4706c1dbd am: 8effce3231 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529106

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99171813b9dba39ac95bab1391fd8db905b5f841
 2021-01-13 15:14:28 +00:00
satayev
5e2b869dfc Revert "[VCN01] Add NOT_VCN_MANAGED capability" 
This reverts commit 869e7020a0.

Reason for revert: b/177411288 broken test

Bug: 177411288
Bug: 175662146
Change-Id: I02a25b83e62ab9a2ed22a98530d62b08de73f56e
 2021-01-13 15:04:23 +00:00
Lorenzo Colitti
8effce3231 Merge "Stop using VPNs in getActiveNetworkForUidInternal." am: c4706c1dbd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529106

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e0de3f3cd9762feecf5dda5a40bb50791f17654
 2021-01-13 14:54:40 +00:00
Lorenzo Colitti
c4706c1dbd Merge "Stop using VPNs in getActiveNetworkForUidInternal." 2021-01-13 13:52:56 +00:00
Junyu Lai
c7714d1c32 Merge "Align coding style of line-wrapping in NetworkCapabilities" am: 74d132736b am: deb6c74bd8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93eb38109e4c72375fb591af0828dac3da1255c7
 2021-01-13 11:50:11 +00:00
Junyu Lai
deb6c74bd8 Merge "Align coding style of line-wrapping in NetworkCapabilities" am: 74d132736b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e1146c6e374a0e7b31d8a8615545f4486fcd4ba
 2021-01-13 11:32:40 +00:00
Junyu Lai
74d132736b Merge "Align coding style of line-wrapping in NetworkCapabilities" 2021-01-13 10:40:43 +00:00
Chiachang Wang
b9789b1bd4 Merge "[IT4.21] Update the label type of idle timer" am: 810f56be46 am: da0694f94a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d54f242cee6171c8666efed21d83349366b7070
 2021-01-13 10:12:15 +00:00
Chiachang Wang
da0694f94a Merge "[IT4.21] Update the label type of idle timer" am: 810f56be46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5bec3e22e835d99ffa6dec818114f8e4fb88ecd
 2021-01-13 09:41:26 +00:00
Chiachang Wang
810f56be46 Merge "[IT4.21] Update the label type of idle timer" 2021-01-13 09:10:43 +00:00
Junyu Lai
101173a281 Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: 82ffaf2ac2 am: 0afa8fa899 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529959

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I782f688fc0cfa8d211b1c9cabaebf22ca19c8791
 2021-01-13 08:44:10 +00:00
Junyu Lai
0afa8fa899 Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: 82ffaf2ac2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529959

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4bb9e25c5488491f3802f9987ca2023e87408ee
 2021-01-13 08:16:03 +00:00
Aaron Huang
11e7cb2433 Rename PacManager to PacProxyInstaller 
Generally, a manager class in Android is used to access
system services and it should be obtained from Context.
This class is a bit different from the definition of a
manager class.

API linter will detect an error if trying to expose a
class name end with Manager. ProxyTracker will create a
new instance of this class so this class needs to be
renamed to avoid API lint error.

Bug: 177035719
Test: FrameworksNetTests
Change-Id: I9185d4fb4342bd285a575f0bdd3518b758f37eb6
 2021-01-13 15:47:45 +08:00