Commit Graph

8226 Commits

Author SHA1 Message Date
Aaron Huang
e435d2aeb1 Expose NetworkCapabilities methods to system/public APIs
Add methods to system/public APIs for mainline support.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest FrameworksNetTests
      atest NetworkStackTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
      atest FrameworksTelephonyTests
      atest android.net.cts
      atest android.net.wifi.cts
      atest android.telephony.cts

Change-Id: I6ec333309172edaf5aa976f83cfbe63512043594
2019-12-27 08:31:06 +00:00
Automerger Merge Worker
a05cd2e774 Merge "Remove tlsFingerprints init value" am: 2a479ab133 am: 28112be9d7 am: 7a377fcbd9
Change-Id: I07a79a786b6847f49859ca04783effd45043d1f6
2019-12-26 07:41:00 +00:00
Automerger Merge Worker
7a377fcbd9 Merge "Remove tlsFingerprints init value" am: 2a479ab133 am: 28112be9d7
Change-Id: I5f5948c707abf2eb3c301d6eb8b63e867acd6e05
2019-12-26 07:26:08 +00:00
Wayne Ma
28112be9d7 Merge "Remove tlsFingerprints init value"
am: 2a479ab133

Change-Id: Ib29fe2d356c6faab809d95233f0b9771a6053191
2019-12-25 23:15:59 -08:00
Wayne Ma
2a479ab133 Merge "Remove tlsFingerprints init value" 2019-12-26 07:13:05 +00:00
Automerger Merge Worker
d744a6bddf [automerger skipped] Merge "[Tether13] Move TetheringManager into framework" am: 2410d67357 am: fc8e151780 am: 9e13b3c8d7 -s ours
am skip reason: Change-Id Ib051bea724a256f9c4572b566e46ae7b9c4abe6e with SHA-1 be9b5e5eea is in history

Change-Id: Id5b74e1af8e1a4276137b4f3eb3d8ffc1a2c903c
2019-12-20 14:13:17 +00:00
Automerger Merge Worker
9e13b3c8d7 Merge "[Tether13] Move TetheringManager into framework" am: 2410d67357 am: fc8e151780
Change-Id: I9ec25eb984e3b534ddcc9313836a319b21526998
2019-12-20 14:00:29 +00:00
Mark Chien
fc8e151780 Merge "[Tether13] Move TetheringManager into framework"
am: 2410d67357

Change-Id: I05c79a1cf07e7679ea2a2c9221e541fb1c9a5a23
2019-12-20 05:47:01 -08:00
Automerger Merge Worker
73a223fc2e [automerger skipped] Merge "Fix parceling of LinkProperties Inet6Addr" into qt-qpr1-dev am: 6b6a9b1972 -s ours am: cb311216fc -s ours
am skip reason: Change-Id Ie5b7782d788717dd1cc440e502d6cdf2d1c18eaa with SHA-1 f72923e980 is in history

Change-Id: Ie0669f5fb253dd20d370ec3cd51239d1f0814607
2019-12-20 09:00:49 +00:00
Automerger Merge Worker
cb311216fc [automerger skipped] Merge "Fix parceling of LinkProperties Inet6Addr" into qt-qpr1-dev am: 6b6a9b1972 -s ours
am skip reason: Change-Id Ie5b7782d788717dd1cc440e502d6cdf2d1c18eaa with SHA-1 f72923e980 is in history

Change-Id: I6c41b293e04f275dce38ee073f75e3be1e433d71
2019-12-20 08:42:19 +00:00
markchien
be9b5e5eea [Tether13] Move TetheringManager into framework
Move tethering out of ConnectivityService. All client would
use TetheringManager to talk with TetheringService directly.

Bug: 144320246
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
2019-12-20 10:31:31 +08:00
markchien
5776f96096 [Tether13] Move TetheringManager into framework
Move tethering out of ConnectivityService. All client would
use TetheringManager to talk with TetheringService directly.

Bug: 144320246
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
Merged-In: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
2019-12-19 20:53:06 +08:00
Automerger Merge Worker
d47c98c15a Fix parceling of LinkProperties Inet6Addr
IPv6 addresses parceled for DNS servers, private DNS servers, PCSCF
servers were parceled without the scope. This causes issues with
link-local DNS servers.

Test: atest FrameworksNetTests
Bug: 145181158
(cherry picked from commit 091f1d790cffc7c0d3ea8c85f540755584df4077)
Merged-In: Ie5b7782d788717dd1cc440e502d6cdf2d1c18eaa

Change-Id: I51313f50de8220988c2c1d26981c27d07dfb55f9
2019-12-19 17:55:00 +09:00
Automerger Merge Worker
76d5022cf9 Merge "Add LinkProperties methods to system APIs" am: 5966c91e94 am: 2b7e2960e3 am: 71b47b486d
Change-Id: I39e9224206a43a85fecaf0956003cd4896ca0820
2019-12-19 08:38:26 +00:00
Automerger Merge Worker
71b47b486d Merge "Add LinkProperties methods to system APIs" am: 5966c91e94 am: 2b7e2960e3
Change-Id: Ie0a102ceb853c9f61d3e1deb369938a48edcdcac
2019-12-19 08:22:11 +00:00
Aaron Huang
2b7e2960e3 Merge "Add LinkProperties methods to system APIs"
am: 5966c91e94

Change-Id: Ib6cc8dff09ed97bdcf8504f8318461e742c34f7a
2019-12-19 00:06:31 -08:00
Aaron Huang
5966c91e94 Merge "Add LinkProperties methods to system APIs" 2019-12-19 08:01:58 +00:00
Paul Hu
d73f6baa90 Fix PermissionMonitor issues
PermissionMonitor#hasPermission only checks permssions that app
requested but it doesn't check whether the permission can be
granted to this app. If requested permission doens't be granted
to app, this method still returns that app has this permission.
Then PermissionMonitor will pass this info to netd that means
this app still can use network even restricted network without
granted privileged permission like CONNECTIVITY_INTERNAL or
CONNECTIVITY_USE_RESTRICTED_NETWORKS.

PermissionMonitor#hasUseBackgroundNetworksPermission only uses
the first package name of the uid for checking permission.
This is incorrect since each package declared different
permissions. So using the mApps which already checked both
network and using restricted network permissions. If uid is in
the mApps list that means uid has one of permission at least.

Bug: 144679405
Test: Build, flash, manual test
      atest FrameworksNetTests

Change-Id: I2da730feda4d7ebed1f158b073167bb3964b3e7d
Merged-In: I8b03c9e23ffc9ff46264d6307fb841a7eda76a76
Merged-In: Ib08a940a6e5d3365c392ab7174d8484c197e0947
(cherry picked from commit 2e1da35b3b903f4aa01435c46b7014b88a41328d)
2019-12-19 13:43:40 +08:00
Automerger Merge Worker
b3df292a9d Merge "Fix parceling of LinkProperties Inet6Addr" am: 98460b6863 am: d33931f634 am: f72923e980
Change-Id: I6692a91c3e00fb8726ed4914f7d7e3c22874a068
2019-12-19 03:46:11 +00:00
waynema
c4e888bf64 Remove tlsFingerprints init value
Initializing the value is no longer necessary because ResolverParamsParcel has
 a default value now

Bug:146100043
Test: FrameworksNetTests pass
Change-Id: Ieb151c0cbb330d25f887cbd2eba9db392699d36e
2019-12-19 11:39:44 +08:00
Automerger Merge Worker
f72923e980 Merge "Fix parceling of LinkProperties Inet6Addr" am: 98460b6863 am: d33931f634
Change-Id: Ie5b7782d788717dd1cc440e502d6cdf2d1c18eaa
2019-12-19 03:29:50 +00:00
Remi NGUYEN VAN
d33931f634 Merge "Fix parceling of LinkProperties Inet6Addr"
am: 98460b6863

Change-Id: I7e4de0ecf06d34f050a881250755c8c0456269fc
2019-12-18 19:12:04 -08:00
Remi NGUYEN VAN
98460b6863 Merge "Fix parceling of LinkProperties Inet6Addr" 2019-12-19 03:07:43 +00:00
Remi NGUYEN VAN
3a59a925e0 Fix parceling of LinkProperties Inet6Addr
IPv6 addresses parceled for DNS servers, private DNS servers, PCSCF
servers were parceled without the scope. This causes issues with
link-local DNS servers.

Test: atest FrameworksNetTests
Bug: 145181158
Change-Id: I0ed24e51d4d0656f4a1f932b5e9f646b35b4b971
2019-12-18 19:52:30 +09:00
paulhu
6c93075645 Fix security problem on PermissionMonitor#hasPermission
PermissionMonitor#hasPermission only checks permssions that app
requested but it doesn't check whether the permission can be
granted to this app. If requested permission doens't be granted
to app, this method still returns that app has this permission.
Then PermissionMonitor will pass this info to netd that means
this app still can use network even restricted network without
granted privileged permission like CONNECTIVITY_INTERNAL or
CONNECTIVITY_USE_RESTRICTED_NETWORKS.

Bug: 144679405
Test: Build, flash, manual test
Change-Id: Iae9c273af822b18c2e6fce04848a86f8dea6410a
Merged-In: I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4
Merged-In: I2da730feda4d7ebed1f158b073167bb3964b3e7d
2019-12-18 07:17:28 +00:00
paulhu
7307d27ff9 Fix security problem on PermissionMonitor#hasPermission
PermissionMonitor#hasPermission only checks permssions that app
requested but it doesn't check whether the permission can be
granted to this app. If requested permission doens't be granted
to app, this method still returns that app has this permission.
Then PermissionMonitor will pass this info to netd that means
this app still can use network even restricted network without
granted privileged permission like CONNECTIVITY_INTERNAL or
CONNECTIVITY_USE_RESTRICTED_NETWORKS.

Bug: 144679405
Test: Build, flash, manual test
Change-Id: I5eba4909e4c2e1d9f275f66be90ac36466b93e90
Merged-In: I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4
Merged-In: Iae9c273af822b18c2e6fce04848a86f8dea6410a
2019-12-18 03:47:28 +00:00
Aaron Huang
441e499861 Add keepalive related methods and fields to system APIs
Add KeepalivePacketData to system API for mainline support.
Also, remove InvalidPacketException class from SocketKeepalive
and create a new InvalidPacketException class in android.net

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest FrameworksNetTests
      atest NetworkStackTests
      atest FrameworksTelephonyTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
      atest android.net.cts
      atest android.net.wifi.cts
      atest android.telephony.cts

Change-Id: I2d982e8abb5cb6b4c74a20483550b18cf814320d
Merged-In: I2d982e8abb5cb6b4c74a20483550b18cf814320d
2019-12-17 16:21:19 +00:00
Aaron Huang
aab5480b48 Merge "Add keepalive related methods and fields to system APIs" 2019-12-17 13:57:13 +00:00
Automerger Merge Worker
72cc4c7e16 Merge changes from topic "dec13_netrevert" am: 9ea156af87 am: 5ca4b7fbf7 am: 814bfc5c14
Change-Id: I266bc6772d5cd2068caa35ecc98b077da2c5255f
2019-12-14 08:31:48 +00:00
Automerger Merge Worker
814bfc5c14 Merge changes from topic "dec13_netrevert" am: 9ea156af87 am: 5ca4b7fbf7
Change-Id: I9f6e7079d8e5d2e978ba618800c98df6e19e022b
2019-12-14 08:20:21 +00:00
Andrew Chant
5ca4b7fbf7 Merge changes from topic "dec13_netrevert"
am: 9ea156af87

Change-Id: I45543535ee0a394adcb4474ae51a0ce803c01f33
2019-12-14 00:06:02 -08:00
Andrew Chant
9ea156af87 Merge changes from topic "dec13_netrevert"
* changes:
  Revert "[NS A24] Add an object to represent changes in assignment"
  Revert "[NS A25] Send all listen callbacks after all rematches"
  Revert "[NS A26] Move available callbacks out of the rematch computation"
  Revert "[NS A27] Remove useless logs and a useless var"
2019-12-14 07:10:08 +00:00
Andrew Chant
6b569b2d62 Revert "[NS A24] Add an object to represent changes in assignment"
This reverts commit c375dccad3.

Reason for revert: Toggling wifi on/off causes networking to
 stop working with these four patches applied.
Bug: 146230156

Change-Id: Ie0217796c89abf0dc86e6a4f8324811155dc57cd
2019-12-14 03:35:07 +00:00
Andrew Chant
9e299b5f30 Revert "[NS A25] Send all listen callbacks after all rematches"
This reverts commit b56e56916f.

Reason for revert: Toggling wifi on/off causes networking to
 stop working with these four patches applied.
Bug: 146230156

Change-Id: Icd368df5ef76991dd2b4c1fa530cbc5fae2f61fa
2019-12-14 03:33:51 +00:00
Andrew Chant
6f9f854916 Revert "[NS A26] Move available callbacks out of the rematch computation"
This reverts commit be083a195f.

Reason for revert: Toggling wifi on/off causes networking to
 stop working with these four patches applied.
Bug: 146230156

Change-Id: I9af7f8b9af1a6279f2b9f1249824da705164c6b5
2019-12-14 03:32:41 +00:00
Andrew Chant
06a8edd342 Revert "[NS A27] Remove useless logs and a useless var"
This reverts commit dbb4dff52e.

Reason for revert: Toggling wifi on/off causes networking to
 stop working with these four patches applied.
Bug: 146230156

Change-Id: I6c75ac179bcc08cc5979194eea69525b333e2ba7
2019-12-14 03:31:20 +00:00
Aaron Huang
5a916810c6 Add keepalive related methods and fields to system APIs
Add KeepalivePacketData to system API for mainline support.
Also, remove InvalidPacketException class from SocketKeepalive
and create a new InvalidPacketException class in android.net

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest FrameworksNetTests
      atest NetworkStackTests
      atest FrameworksTelephonyTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
      atest android.net.cts
      atest android.net.wifi.cts
      atest android.telephony.cts

Change-Id: I2d982e8abb5cb6b4c74a20483550b18cf814320d
2019-12-13 23:05:37 +08:00
Automerger Merge Worker
e53ad944a0 Merge changes I4b793e86,I6f86add0,I2db9535b,I703db6d3 am: ff54f522a6 am: 149ad76a9a am: e4b05fdcb6
Change-Id: Ic7da17d474c2d699bd0053547698840b5d87972d
2019-12-13 08:38:04 +00:00
Automerger Merge Worker
e4b05fdcb6 Merge changes I4b793e86,I6f86add0,I2db9535b,I703db6d3 am: ff54f522a6 am: 149ad76a9a
Change-Id: Ib7b7179a2cff581f7187293880edc1163756cf06
2019-12-13 08:18:12 +00:00
Chalard Jean
149ad76a9a Merge changes I4b793e86,I6f86add0,I2db9535b,I703db6d3
am: ff54f522a6

Change-Id: Ic4317f9edf1ca8a1d9d47f53805c57a6ed63ba65
2019-12-13 00:09:32 -08:00
Chalard Jean
ff54f522a6 Merge changes I4b793e86,I6f86add0,I2db9535b,I703db6d3
* changes:
  [NS A27] Remove useless logs and a useless var
  [NS A26] Move available callbacks out of the rematch computation
  [NS A25] Send all listen callbacks after all rematches
  [NS A24] Add an object to represent changes in assignment
2019-12-13 06:50:36 +00:00
Automerger Merge Worker
424ed576d2 Merge "Fix a doc" am: dc98e9be4c am: 082a268952 am: 70c582b46d
Change-Id: Id95b0c48ad7813ba31f2faad79600affc4856b95
2019-12-12 14:38:32 +00:00
Automerger Merge Worker
70c582b46d Merge "Fix a doc" am: dc98e9be4c am: 082a268952
Change-Id: I774c526b9fd7ae58ec690438e7de7fb532cd555f
2019-12-12 14:27:33 +00:00
Chalard Jean
082a268952 Merge "Fix a doc"
am: dc98e9be4c

Change-Id: Ic8624437203122ffb9fd6a3d07b8abe335cb68e9
2019-12-12 06:23:11 -08:00
Chalard Jean
dc98e9be4c Merge "Fix a doc" 2019-12-12 14:15:28 +00:00
Automerger Merge Worker
2d41a6ebe6 Merge "Make getNetworkSpecifier() public API." am: ad60ef88e0 am: c0f993bb04 am: f5d13c5ac5
Change-Id: I73894e4236dc5660f2eb54be3d48aa7359822947
2019-12-12 12:47:00 +00:00
Automerger Merge Worker
f5d13c5ac5 Merge "Make getNetworkSpecifier() public API." am: ad60ef88e0 am: c0f993bb04
Change-Id: I884c4e4c9ed891594845d599358f19f4a8e2ad60
2019-12-12 12:26:06 +00:00
Chalard Jean
c0f993bb04 Merge "Make getNetworkSpecifier() public API."
am: ad60ef88e0

Change-Id: I92d0b7cb179e1c0f5cb789c2c668254732fbf30a
2019-12-12 04:04:32 -08:00
Chalard Jean
2e3154435f Fix a doc
Test: FrameworksNetTests
Change-Id: I5c9aeb627d9f22aa84bc134b6c7d3c15f237a775
2019-12-12 13:56:13 +09:00
Chalard Jean
dbb4dff52e [NS A27] Remove useless logs and a useless var
These logs haven't found a bug in a long time and we now have
some structural guarantees that the conditions they check for
can't happen (like the checks that everything is happening on
the same thread).
Maybe we'll reinstate similar checks later, but for now they
are in the way and removing them is a small sacrifice for the
intended benefit.

The local was simply not used any more.

Test: FrameworksNetTests
Change-Id: I4b793e86039c204a038c1b0fecbf8a4927eef48d
2019-12-12 13:55:32 +09:00