Commit graph

8,561 commits

Message SHA1
Merge changes from topic "revert-10338939-YCRBMILGZV"
* changes:
  Revert "[NS D03] Migrate the bad wifi avoidance policy"
  Revert "[NS D04] Implement a simple speed comparison between scores."

TreeHugger Robot   authored and   Android (Google) Code Review   commited 2020-02-21 08:51:09 +00:00
fede1237e0
Merge changes from topic "revert-10343065-HRWTWGOFZV"
* changes:
  Revert "[NS D05] Rework how to tear down networks"
  Revert "[NS D06] Implement more policies"
  Revert "[NS D07] Use the unmodified legacy score"

TreeHugger Robot   authored and   Android (Google) Code Review   commited 2020-02-21 07:53:30 +00:00
77eea40def
Revert "[NS D03] Migrate the bad wifi avoidance policy"
Revert submission 10338939

Reason for revert: The feature was punted out of R.
Reverted Changes:
I32c12702c:[NS D04] Implement a simple speed comparison betwe...
I688593cc0:[NS D03] Migrate the bad wifi avoidance policy

Change-Id: I640635a1ed94bed3b53466abe2a988caf0eca2b0

Chalard Jean   commited 2020-02-21 06:47:35 +00:00
12dcdccc4f
Revert "[NS D04] Implement a simple speed comparison between scores."
Revert submission 10338939

Reason for revert: The feature was punted out of R.
Reverted Changes:
I32c12702c:[NS D04] Implement a simple speed comparison betwe...
I688593cc0:[NS D03] Migrate the bad wifi avoidance policy

Change-Id: I28172721d3f3af82ac79ef2c8f61df39943d997b

Chalard Jean   commited 2020-02-21 06:46:06 +00:00
f892de96eb
Revert "[NS D05] Rework how to tear down networks"
Revert submission 10343065

Reason for revert: This is part of a feature that was punted out of R.
Reverted Changes:
Ic9a3d3363:[NS D05] Rework how to tear down networks
I7d815f873:[NS D06] Implement more policies
I561098476:[NS D07] Use the unmodified legacy score

Change-Id: I8d2696d15999265d79abfc9163e7e5ccad873cfe

Chalard Jean   commited 2020-02-20 07:32:12 +00:00
0a32f7f818
Revert "[NS D06] Implement more policies"
Revert submission 10343065

Reason for revert: This is part of a feature that was punted out of R.
Reverted Changes:
Ic9a3d3363:[NS D05] Rework how to tear down networks
I7d815f873:[NS D06] Implement more policies
I561098476:[NS D07] Use the unmodified legacy score

Change-Id: I378449443f99eb0a7f01f31f53398b8f55ce87f1

Chalard Jean   commited 2020-02-20 07:32:12 +00:00
47d3019bd4
Revert "[NS D07] Use the unmodified legacy score"
Revert submission 10343065

Reason for revert: This is part of a feature that was punted out of R.
Reverted Changes:
Ic9a3d3363:[NS D05] Rework how to tear down networks
I7d815f873:[NS D06] Implement more policies
I561098476:[NS D07] Use the unmodified legacy score

Change-Id: I184817e3aa290afdbe6721a7c36332b940434d3a

Chalard Jean   commited 2020-02-20 07:32:12 +00:00
2c34674c6a
Merge "Sanitize owner UID iff owning app does not have location permissions." am: 90b14db3b2 am: 69e9dd54d5 am: 2e8e5d4439
Change-Id: I9b8fb3ff8d907ecda918a8a926edb133b742c8f1

Automerger Merge Worker   commited 2020-02-20 05:59:35 +00:00
18a137c56a
Merge "Sanitize owner UID iff owning app does not have location permissions." am: 90b14db3b2 am: 69e9dd54d5
Change-Id: Ib99af41b78dc9539f2a553231e13549d348b72db

Automerger Merge Worker   commited 2020-02-20 05:48:02 +00:00
2e8e5d4439
Merge "Sanitize owner UID iff owning app does not have location permissions." am: 90b14db3b2
Change-Id: Ie5876d063d7440aacc57d48cb4573798303910ea

Automerger Merge Worker   commited 2020-02-20 05:30:20 +00:00
69e9dd54d5
Merge "Sanitize owner UID iff owning app does not have location permissions."
Qingxi Li   authored and   Gerrit Code Review   commited 2020-02-20 05:20:27 +00:00
90b14db3b2
Merge "Update NetworkMonitor integration test constructor" am: 31b2039968 am: eea9755ef2 am: 282f90f6dc
Change-Id: Ifc184f8262b33ddbbad1ccc7a1ef0b67259f2e55

Automerger Merge Worker   commited 2020-02-20 04:31:39 +00:00
b829103fc7
[automerger skipped] Merge "DO NOT MERGE: RELAND: NetworkRequest: Embed requestor uid & packageName" into stage-aosp-master am: be37378755 -s ours am: e6637e4c74 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifdd6d655de499c5e64f59e7ae0ca9ae2fad62e62

Automerger Merge Worker   commited 2020-02-20 04:31:25 +00:00
54009a51ac
[automerger skipped] Merge "DO NOT MERGE: RELAND: NetworkRequest: Embed requestor uid & packageName" into qt-qpr1-dev-plus-aosp am: ab0a3ea5f6 -s ours
am skip reason: subject contains skip directive

Change-Id: I9fb0affe108fe4656d1fafad8b04bea4bdcd3cc2

Automerger Merge Worker   commited 2020-02-20 04:29:03 +00:00
25c54ed60a
Merge "Update NetworkMonitor integration test constructor" am: 31b2039968 am: eea9755ef2
Change-Id: Ibd4c6ad05acf81513b54b41341b6ed0203480471

Automerger Merge Worker   commited 2020-02-20 01:38:04 +00:00
282f90f6dc
Merge "Update NetworkMonitor integration test constructor" am: 31b2039968
Change-Id: Idc27d7900d98eaa8ab3265d6ad6ad82b075197e5

Automerger Merge Worker   commited 2020-02-20 01:24:58 +00:00
eea9755ef2
[automerger skipped] Merge "DO NOT MERGE: RELAND: NetworkRequest: Embed requestor uid & packageName" into stage-aosp-master am: be37378755 -s ours
am skip reason: Change-Id I207c446108afdac7ee2c25e6bbcbc37c4e3f6529 with SHA-1 31f7152793 is in history

Change-Id: Iac17ca3df5826eb235fbc7ef02c0a5de4f06f44e

Automerger Merge Worker   commited 2020-02-20 01:19:31 +00:00
e6637e4c74
Merge "Update NetworkMonitor integration test constructor"
Chalard Jean   authored and   Gerrit Code Review   commited 2020-02-20 01:13:05 +00:00
31b2039968
Sanitize owner UID iff owning app does not have location permissions.
This change adds permission checking to ensure that the following
conditions are enforced in order for apps to receive the owner UID:
1. The app must be the owner of the network
2. The app must hold the FINE_LOCATION permission/appop
3. The user must have their location toggle enabled.

Bug: 142072839
Test: atest FrameworksNetTests
Change-Id: I7a981a82f1219828ee89c8c96eb9d2efd153377f

Qingxi Li   commited 2020-02-20 01:02:42 +00:00
bf6bf08a7e
DO NOT MERGE: RELAND: NetworkRequest: Embed requestor uid & packageName
Add the requestorUid & requestorPackageName fields to
NetworkCapabilities. This is populated by CS when
a new network request is received.
These 2 requestor fields are also optionally used for network
matching. All of the regular app initiated requests will have the
requestor uid and package name set by connectivity service. Network
agents can optionally set the requestorUid and requestorPackageName
to restrict the network created only to the app that requested the network.

This will help removing the necessity for the various specifiers to embed
the uid & package name info in the specifier for network matching.

Note: NetworkSpecifier.assertValidFromUid() is deprecated & removed in
favor of setting the uid/package name on the agent to restrict the
network to a certain app (useful for wifi peer to peer API & wifi aware).

Bug: 144102365
Test: Verified that wifi network request related CTS verifier tests
pass.
Test: Device boots up and connects to wifi networks
Merged-In: I207c446108afdac7ee2c25e6bbcbc37c4e3f6529

Change-Id: I58775e82aa7725aac5aa27ca9d2b5ee8f0be4242

Roshan Pius   authored and   Benedict Wong   commited 2020-02-19 23:12:32 +00:00
34dc4beda4
DO NOT MERGE: RELAND: NetworkRequest: Embed requestor uid & packageName
Add the requestorUid & requestorPackageName fields to
NetworkCapabilities. This is populated by CS when
a new network request is received.
These 2 requestor fields are also optionally used for network
matching. All of the regular app initiated requests will have the
requestor uid and package name set by connectivity service. Network
agents can optionally set the requestorUid and requestorPackageName
to restrict the network created only to the app that requested the network.

This will help removing the necessity for the various specifiers to embed
the uid & package name info in the specifier for network matching.

Note: NetworkSpecifier.assertValidFromUid() is deprecated & removed in
favor of setting the uid/package name on the agent to restrict the
network to a certain app (useful for wifi peer to peer API & wifi aware).

Bug: 144102365
Test: Verified that wifi network request related CTS verifier tests
pass.
Test: Device boots up and connects to wifi networks
Merged-In: I207c446108afdac7ee2c25e6bbcbc37c4e3f6529

Change-Id: I58775e82aa7725aac5aa27ca9d2b5ee8f0be4242

Roshan Pius   authored and   Benedict Wong   commited 2020-02-19 23:12:28 +00:00
efbc8e7403
[automerger skipped] Merge "Use framework-tethering-stub instead of framework-tethering" am: 7392615bbf am: e191e902b7 am: 0e6ddc8130 -s ours
am skip reason: Change-Id I97ef83f7f9b4c1376f373713036f5256318f1050 with SHA-1 9e04624f15 is in history

Change-Id: I1771917998eeda2d18abb1f576e5091828651ea0

Automerger Merge Worker   commited 2020-02-19 23:09:23 +00:00
b19d32cabc
Merge changes from topic "settings-vpn" am: 70f90282ef am: db9074340f am: 677224dbd5
Change-Id: Idac6e83bab50b818e2776f28da380f08000e2a42

Automerger Merge Worker   commited 2020-02-19 23:08:32 +00:00
6f39a6c130
[automerger skipped] Add always-on VPN support for platform VPNs am: 2482518ce3 am: 0ba1fb6181 am: c7fc6dd59f -s ours
am skip reason: Change-Id I5eda88e5b406a0e425eb7424665cf702e0979324 with SHA-1 c13b9a30b6 is in history

Change-Id: Id27267529b42f1b1be90613574f91e5fe7c780e4

Automerger Merge Worker   commited 2020-02-19 23:08:21 +00:00
4216311e1e
[NS D07] Use the unmodified legacy score
Ranking used to make use of the various adjustments in
ConnectivityService. These are now implemented in policy.

Test: ConnectivityServiceTest

Change-Id: I56109847678ea5cda1752511123ba652c0f4fe36

Chalard Jean   commited 2020-02-19 22:17:13 +09:00
a3fcb0d3e0
[NS D06] Implement more policies
Namely :
• Explicitly selected policy
• VPN policy
• Validated policy

These go together to avoid breaking any test, because multiple
tests rely on all of these working.

Test: ConnectivityServiceTest

Change-Id: I7d815f87320c2becbfc93a60a3c54346ff4f47c9

Chalard Jean   commited 2020-02-19 22:17:12 +09:00
2adc561aa1
[NS D05] Rework how to tear down networks
Networks are torn down if they don't satisfy requests but only if
they are found unable to ever do so. This is important because
general-purpose networks typically turn up unvalidated, which
means they would get torn down immediately in the presence of
some worse network that is already validated.

Note that functionally it's the same as before for the existing
scores, except that
• An exiting network that doesn't satisfy any request is always
  torn down immediately – this is WAI
• An unmetered network is never torn down when compared to a
  metered network – this is a bugfix (previously the platform
  would tear down an unmetered cellular on grounds that it
  could not beat the performance of a metered Ethernet, but
  that's wrong ; the bug was never realized because Android
  always thinks Ethernet is unmetered)
• An unvalidated network will not be torn down if the current
  satisfier is also unvalidated, even if the satisfier is much
  faster. This is the reason for the change in the test. It's
  wrong to tear down in this case because even if much slower
  the slower network should win if it validates and the other
  doesn't.

Test: ConnectivityServiceTest
Change-Id: Ic9a3d336306a25d1272976ce467aa7c908af7bef

Chalard Jean   commited 2020-02-19 21:27:22 +09:00
2a572e0a6d
Merge "Use framework-tethering-stub instead of framework-tethering" am: 7392615bbf am: e191e902b7
Change-Id: I42e51c703c47bdb5e589747047b5a4ef77a9ed82

Automerger Merge Worker   commited 2020-02-19 10:10:15 +00:00
0e6ddc8130
Merge "Use framework-tethering-stub instead of framework-tethering" am: 7392615bbf
Change-Id: I2caaa5f804a510bcc18822b784c129e9b058ea03

Automerger Merge Worker   commited 2020-02-19 09:54:51 +00:00
e191e902b7
Merge "Use framework-tethering-stub instead of framework-tethering"
Mark Chien   authored and   Gerrit Code Review   commited 2020-02-19 09:46:24 +00:00
7392615bbf
Merge changes from topic "settings-vpn" am: 70f90282ef am: db9074340f
Change-Id: I2e4fdab485b9a94e8b2f121b21269f374b21dcb9

Automerger Merge Worker   commited 2020-02-19 08:07:41 +00:00
677224dbd5
Add always-on VPN support for platform VPNs am: 2482518ce3 am: 0ba1fb6181
Change-Id: I4b1d796a7af3a9e421a330fd8ff713556c55dc67

Automerger Merge Worker   commited 2020-02-19 08:07:38 +00:00
c7fc6dd59f
Merge changes from topic "settings-vpn" am: 70f90282ef
Change-Id: If7e8310306889b38527bfab65316a50807814372

Automerger Merge Worker   commited 2020-02-19 07:51:20 +00:00
db9074340f
Add always-on VPN support for platform VPNs am: 2482518ce3
Change-Id: I9f600a9ea2002bf9a1ee88137e3a29b2c90b22ac

Automerger Merge Worker   commited 2020-02-19 07:51:14 +00:00
0ba1fb6181
Use framework-tethering-stub instead of framework-tethering
The non-updatable part of the platform now is built with
framework-tethering-stub, which is a stub library of
framework-tethering.

Bug: 147200698
Test: m
Change-Id: I97ef83f7f9b4c1376f373713036f5256318f1050
Merged-In: I97ef83f7f9b4c1376f373713036f5256318f1050

markchien   commited 2020-02-19 15:10:44 +08:00
218230f97f
Add support for starting IKEv2/IPsec VPNs from settings
This commit allows the startLegacyVpn() call to start Platform VPN
profiles, allowing Settings to use the IKEv2/IPsec VPN options

When using an aliased private key, the
Ikev2VpnProfile.KEYSTORE_ALIAS_PREFIX must be prepended to the front of
the alias. This will in turn result in the fromVpnProfile() function to
pull the key from the KeyStore, as opposed to the inline-key that the
VpnManager API uses.

Bug: 148991741
Test: FrameworksNetTests passing, new tests added in subsequent CL
Test: Manually tested
Change-Id: Icbca695c353b2e12e99305676404dbf1a4495949

Benedict Wong   commited 2020-02-19 02:44:34 +00:00
d896b133e3
Add always-on VPN support for platform VPNs
This commit allows Platform VPNs to be started as part of always-on
mode.

Test: FrameworksNetTests passing, new tests added in subsequent CL
Test: Manually tested.
Change-Id: I5eda88e5b406a0e425eb7424665cf702e0979324
Merged-In: I5eda88e5b406a0e425eb7424665cf702e0979324

Benedict Wong   commited 2020-02-18 22:13:31 +00:00
2482518ce3
Add always-on VPN support for platform VPNs
This commit allows Platform VPNs to be started as part of always-on
mode.

Test: FrameworksNetTests passing, new tests added in subsequent CL
Test: Manually tested.
Change-Id: I5eda88e5b406a0e425eb7424665cf702e0979324

Benedict Wong   commited 2020-02-18 18:58:54 +00:00
c13b9a30b6
Merge changes I32c12702,I688593cc
* changes:
  [NS D04] Implement a simple speed comparison between scores.
  [NS D03] Migrate the bad wifi avoidance policy

Chalard Jean   authored and   Android (Google) Code Review   commited 2020-02-18 10:51:26 +00:00
d3267fd304
[NS D04] Implement a simple speed comparison between scores.
This is not used yet to avoid making the change too big to review,
but D05 will use this. Refer to D05 for how this is going to be
used.

Test: ConnectivityServiceTest
Change-Id: I32c12702c8bce959682b02f157946d3f37b12a0c

Chalard Jean   commited 2020-02-18 16:15:22 +09:00
9450bd6831
[NS D03] Migrate the bad wifi avoidance policy
Test: ConnectivityServiceTest
Bug: 113554781

Change-Id: I688593cc0379a0d2042e30fbe83e549dcb02723e

Chalard Jean   commited 2020-02-18 16:06:10 +09:00
edf5386cf0
Merge changes Ide9daebc,Id47ada57 am: 1609800ef9 am: 0cf192258c am: c95de7b476
Change-Id: Iaacfbe8b221d79e3d06d0d7ea81528db13e4611a

Benedict Wong   commited 2020-02-18 06:35:06 +00:00
1297529bf9
Merge "[NS D02] Mix in the ignore on wifi policy."
Chalard Jean   authored and   Android (Google) Code Review   commited 2020-02-18 05:46:33 +00:00
44d018295b
Merge changes Ide9daebc,Id47ada57 am: 1609800ef9 am: 0cf192258c
Change-Id: I712e6e42cc754db2513321b3498018b21b94161e

Benedict Wong   commited 2020-02-17 22:23:15 +00:00
c95de7b476
Merge changes Ide9daebc,Id47ada57 am: 1609800ef9
Change-Id: Ied52fed05566a0d75e82007170210205db7832a8

Benedict Wong   commited 2020-02-17 22:01:24 +00:00
0cf192258c
Merge changes Ide9daebc,Id47ada57
* changes:
  Ensure all VPN runners clean up state when exiting
  Enforce restricted user, getConnectionOwnerUid checks

Benedict Wong   authored and   Gerrit Code Review   commited 2020-02-17 21:30:35 +00:00
1609800ef9
Merge changes from topics "capport_dhcpresults", "nm_cb_capport" am: 66b08c6e20 am: 7afcf10ca6 am: d45ab73281
Change-Id: Ie27e5dfd51b38194fa104cbd73f9bbe7c4395e0f

Lorenzo Colitti   commited 2020-02-17 14:20:04 +00:00
5c8c6fc3d2
Merge "Update state in NetworkInfo when network resumes" am: c27f541f1b am: 03bc93d50d am: 458d8ff0b1
Change-Id: I98e64e6197c5e79e6425f39053981f7bf389a895

Chiachang Wang   commited 2020-02-17 14:18:56 +00:00
cd0874d3cf
[automerger skipped] Merge "Revert "Remove framework code that has moved to frameworks/libs/net"" am: 14c76eba82 am: 69075c2d1b am: 9c339214df -s ours
am skip reason: skipped by user taylori

Change-Id: If1e7e8719516855f6ad77afdb472ed96c2d0703e

Isabelle Taylor   commited 2020-02-17 11:37:15 +00:00
f1b9ab205e
[automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 03d86d613c am: 840975d91d am: 9ad2ea5c61 -s ours
am skip reason: skipped by user huangaaron

Change-Id: I7f5c1c3a41a779512658008fafe108b1e99182ec

Aaron Huang   commited 2020-02-17 11:31:07 +00:00
6f0c100653