Commit Graph

12619 Commits

Author SHA1 Message Date
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
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
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
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
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
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
afb977d841 Merge "Migrate Slog usage in MultinetworkPolicyTracker to Log" am: 3637b6d0bf am: 8754a60bb9 am: 644892e3cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549720

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad48fae63c7ef8c72e565cee8426fcbdd20c6295
2021-01-14 10:20:03 +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
Junyu Lai
d151942b6a Merge "[VCN05] Pass request type when requesting network" am: 8188af4521 am: b728deeb7f am: 53f3094fb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545846

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4280a78822db2943f0a62a3d729aac3b5f64326d
2021-01-14 09:05:35 +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
728980f276 Merge "Rename PacManager to PacProxyInstaller" am: 8505c870cd am: 51203ec517 am: 2a89cb3753
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513130

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10ff3bab210dbfeb10a19ea99459038499ce5ed9
2021-01-14 04:44:01 +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
Roshan Pius
0a0c036906 Merge changes from topic "revert-13329427-revert-13274595-XTPTORCRLV-WLDUPFEJWD"
* changes:
  NetworkControllerWifiTest: Fix unit tests
  Revert "Revert "NetworkCapabilities: Embed location senstive Tra..."
2021-01-14 01:19:34 +00:00
Adam Bookatz
829e46bf2a Merge "UserManager restricted profile SystemApis" 2021-01-13 22:47:26 +00:00