Commit Graph

7877 Commits

Author SHA1 Message Date
Paul Hu
dd32fc08e7 Merge "Replace the permission of internal connectivity checks" 2019-12-04 05:52:01 +00:00
paulhu
ec0a963cea Replace the permission of internal connectivity checks
A number of connectivity checks that protect system-only methods
check for CONNECTIVITY_INTERNAL, but CONNECTIVITY_INTERNAL is a
signature|privileged permission. We should audit the permission
checks, and convert checks that protect code that should not be
called outside the system to a signature permission. So replace
all CONNECTIVITY_INTERNAL to other proper permissions.

Bug: 32963470
Test: atest FrameworksNetTests NetworkPolicyManagerServiceTest
Change-Id: I8f2dd1cd0609056494eaf612d39820e273ae093f
2019-12-04 11:45:51 +08:00
Automerger Merge Worker
7465ce4923 Merge "Disable a flaky test" am: 932dda858a am: 18946e3c78
Change-Id: Ia3596b558fb09600e7d9a16f0dce03d4402ee653
2019-12-03 16:51:32 +00:00
Chalard Jean
18946e3c78 Merge "Disable a flaky test" am: 932dda858a
am: cee0905447

Change-Id: Ie1fccb536e6df45491139ead179e8f5c2127d98f
2019-12-03 08:38:00 -08:00
Chalard Jean
cee0905447 Merge "Disable a flaky test"
am: 932dda858a

Change-Id: I8a6fc40976c6ab234cabd4af37dc4a530e2b47a1
2019-12-03 08:30:03 -08:00
Chalard Jean
b04416ea86 Disable a flaky test
Bug: 145513323
Test: FrameworkNetTests
Change-Id: I66e02fdaab2969b77db4a0f0e6fb8b1a981d9350
2019-12-03 16:13:22 +09:00
Chalard Jean
45b2b6fdbb Merge changes I720a1feb,I9539b8cc,Ib79b777b am: 230687643c am: 75b3919e0c
am: 8c29860024

Change-Id: I6bfd8dc565cb4b835f65c3e144848bd6099272c7
2019-12-02 01:59:20 -08:00
Chalard Jean
8c29860024 Merge changes I720a1feb,I9539b8cc,Ib79b777b am: 230687643c
am: 75b3919e0c

Change-Id: I66a58f6f54a4d423ad603a2b642e6510c29bc07a
2019-12-02 01:55:20 -08:00
Chalard Jean
75b3919e0c Merge changes I720a1feb,I9539b8cc,Ib79b777b
am: 230687643c

Change-Id: Ieaa1371f6e52074b76e3353ea9a2653c783ff04e
2019-12-02 01:51:07 -08:00
Chalard Jean
230687643c Merge changes I720a1feb,I9539b8cc,Ib79b777b
* changes:
  [NS A17] Update linger state after rematching.
  [NS A16] Cleanup
  [NS A15] Move legacy default broadcasts out of the loop
2019-12-02 09:40:44 +00:00
Chalard Jean
0f5ed2269c Merge changes I0613c23f,Ibeab8d0a,I8bd668ad,I7d3a16be am: 604c2121a4 am: ea7b582312
am: 1922a45e9d

Change-Id: I4540ad08fbb1ccabf0a19f73bc36611194ef8bfa
2019-12-01 21:37:03 -08:00
Chalard Jean
1922a45e9d Merge changes I0613c23f,Ibeab8d0a,I8bd668ad,I7d3a16be am: 604c2121a4
am: ea7b582312

Change-Id: Idca7b76f4e638aaa88ededcbfc890492152211e9
2019-12-01 21:32:55 -08:00
Chalard Jean
ea7b582312 Merge changes I0613c23f,Ibeab8d0a,I8bd668ad,I7d3a16be
am: 604c2121a4

Change-Id: Ibe34e78e53a15e987042703fdd27d6393e4e7d59
2019-12-01 21:26:44 -08:00
Chalard Jean
604c2121a4 Merge changes I0613c23f,Ibeab8d0a,I8bd668ad,I7d3a16be
* changes:
  [NS A14] Move code notifying battery stats in its right place
  [NS A13] Move legacy broadcast handling after rematch.
  [NS A12] Move some legacy type tracker handling to a function
  Add tests for ConnectivityService → BatteryStats messages
2019-12-02 05:17:39 +00:00
Chalard Jean
41bae5c936 [NS A17] Update linger state after rematching.
Test: FrameworksNetTests NetworkStackTests
Change-Id: I720a1feb89088aa123201ef5867de444234343e8
2019-12-02 13:02:41 +09:00
Chalard Jean
4005aeb760 [NS A16] Cleanup
Move LegacyTypeTracker work into a function for readability.

Test: FrameworksNetTests NetworkStackTests
Change-Id: I9539b8cc4422b3a0cc1d3d9b3a44d59dc1905b44
2019-12-02 13:02:41 +09:00
Chalard Jean
76b041667a [NS A15] Move legacy default broadcasts out of the loop
Test: FrameworksNetTests NetworkStackTests
Change-Id: Ib79b777b5efda3a4c85c30055f1a6d03d5d04c25
2019-12-02 13:02:41 +09:00
Chalard Jean
e55503198b [NS A14] Move code notifying battery stats in its right place
This should be done once every time an interface comes online.
Doing this in updateLinkProperties guarantees this happens every
time a new interface comes online, but it doesn't do it more
often than needed.

Test: FrameworksNetTests NetworkStackTests
Change-Id: I0613c23f44192944266d76107308da8d1c541d1c
2019-12-02 13:02:38 +09:00
Chalard Jean
12ed34c77a Merge "Give apps access to the NAT64 prefix." am: d6d1874f83 am: 72a0f88e74
am: 9038bc9908

Change-Id: I759e5da8648fd10b26aa235410ee6e22e1976a9b
2019-12-01 18:33:11 -08:00
Chalard Jean
9038bc9908 Merge "Give apps access to the NAT64 prefix." am: d6d1874f83
am: 72a0f88e74

Change-Id: I251c5ac17fb728d6f0fe91fd96c115c8b8d1879c
2019-12-01 18:27:36 -08:00
Chalard Jean
72a0f88e74 Merge "Give apps access to the NAT64 prefix."
am: d6d1874f83

Change-Id: I673a44f3f75a2395ae3d9d436c83708f20f414e6
2019-12-01 18:20:00 -08:00
Treehugger Robot
d6d1874f83 Merge "Give apps access to the NAT64 prefix." 2019-12-02 02:05:16 +00:00
Mark Chien
481afae6af [automerger skipped] Merge changes from topic "tether_migrate" am: 254a71dd7b am: 29e7ec4550
am: 5515d06c39 -s ours
am skip reason: change_id I4ed08d20f8b7476b8ecd5d018b75806dd2f22cc1 with SHA1 1ddfba4a60 is in history

Change-Id: I630b00c69238730fe5aa267a658f93edb236acc6
2019-11-30 04:36:38 -08:00
markchien
287bd7ffbc [automerger skipped] [Tether07] Migrate Tethering into module am: 497a062e04 am: 7444958737
am: 6d49c339e8 -s ours
am skip reason: change_id I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3 with SHA1 0eda8558ae is in history

Change-Id: Ie6a28a142e2cf75adfc3d1a45d87e9daa67423e4
2019-11-30 04:36:30 -08:00
Mark Chien
5515d06c39 Merge changes from topic "tether_migrate" am: 254a71dd7b
am: 29e7ec4550

Change-Id: Ice864e02b2ef9da73f5a69e0668b6856e718988f
2019-11-30 04:31:35 -08:00
markchien
6d49c339e8 [Tether07] Migrate Tethering into module am: 497a062e04
am: 7444958737

Change-Id: I6e71b418b7303d37144532ab056c21ccbefcb554
2019-11-30 04:31:28 -08:00
Mark Chien
29e7ec4550 Merge changes from topic "tether_migrate"
am: 254a71dd7b

Change-Id: I03e43b7a112f91637941e5193bd21b3e714f5dac
2019-11-30 04:26:07 -08:00
markchien
7444958737 [Tether07] Migrate Tethering into module
am: 497a062e04

Change-Id: I1aaa034e91eae2d6e9abcbbd70741a54a18b3ddc
2019-11-30 04:25:57 -08:00
Mark Chien
254a71dd7b Merge changes from topic "tether_migrate"
* changes:
  [Tether10]Remove UserManagerInternal usage in Tethering
  [Tether07] Migrate Tethering into module
  [Tether07] Clean up build rule for libtetheroffloadjni
2019-11-30 12:17:47 +00:00
Chalard Jean
6491fb772c Give apps access to the NAT64 prefix.
Apps that do their own DNS queries need to know the NAT64 prefix
to resolve v4 addresses on v6-only networks.

Test: FrameworksNetTests NetworkStackTests
Bug: 144877069
Change-Id: I5a255b7afc2038646b93a0ab893f8ad62d0fb34f
2019-11-30 10:25:02 +00:00
markchien
497a062e04 [Tether07] Migrate Tethering into module
Now tethering would be run in dedicated service.
TetheringManager is the interface used to communicate with
TetheringService. The new call flow would be: ConnectivityManager
-> ConnectivityService -> TetheringManager -> TetheringService.
Note: the return value of #tether(), #untether() and #setUsbTethering()
APIs would always be no error. Client can use #getLastTetherError()
or #getTetheredIfaces or listen tether state change to check
status of corresponding interface.

Bug: 136040414
Bug: 144742179
Test: -build, flash, boot
      -atest TetheringTests
      -atest FrameworksNetTests

Change-Id: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
Merged-In: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
2019-11-30 10:03:08 +00:00
TreeHugger Robot
3d6ef9f0d3 Merge changes from topic "tethering-migrate"
* changes:
  [Tether10]Remove UserManagerInternal usage in Tethering
  [Tether07] Migrate Tethering into module
  [Tether07] Clean up build rule for libtetheroffloadjni
2019-11-29 17:05:14 +00:00
Chalard Jean
dc623310c4 [NS A13] Move legacy broadcast handling after rematch.
As opposed to other patches in this series, there is a logic change
here. This will send all necessary legacy broadcasts after all
matches have been done.

This should be fine because the callbacks and the broadcasts are
unordered anyway, and the broadcasts are still sent in the same
order as before ; there should not be an observable change from
apps besides some jitter.

Bug: 113554781
Test: ConnectivityServiceTest
Change-Id: Ibeab8d0a9106c5198228888ac33084238c0a4a1a
2019-11-29 16:59:31 +09:00
Chalard Jean
9fdd38a21a [NS A12] Move some legacy type tracker handling to a function
It's fine to do this out of the if() clause because :
• If the network newly satisfies a request it is sure to have
  it in the list of requests it satisfies
• If it does not newly satisfy a request and there is still
  a request with a legacy type that it satisfies, then it
  is already remembered by LegacyTypeTracker

As for the VPN, the code always enters the condition anyway.

Test: ConnectivityServiceTest
Change-Id: I8bd668ad27043d6a5036b1b3c52fa5a3146abcfa
2019-11-29 16:59:31 +09:00
Chalard Jean
c63c19ddce Add tests for ConnectivityService → BatteryStats messages
Test: ConnectivityServiceTest
Bug: 113554781
Change-Id: I7d3a16be76f606872f8edb84647b9ef94f36cba1
2019-11-29 16:59:30 +09:00
markchien
0eda8558ae [Tether07] Migrate Tethering into module
Now tethering would be run in dedicated service.
TetheringManager is the interface used to communicate with
TetheringService. The new call flow would be: ConnectivityManager
-> ConnectivityService -> TetheringManager -> TetheringService.
Note: the return value of #tether(), #untether() and #setUsbTethering()
APIs would always be no error. Client can use #getLastTetherError()
or #getTetheredIfaces or listen tether state change to check
status of corresponding interface.

Bug: 136040414
Bug: 144742179
Test: -build, flash, boot
      -atest TetheringTests
      -atest FrameworksNetTests

Change-Id: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
2019-11-29 07:05:21 +00:00
Aaron Huang
8801199e83 Merge "Add IpConfiguration parcelable interface implementation to system API" am: 9ff42e83d1 am: db770e3ed4
am: 54861e8164

Change-Id: I9add4992fbacca4668867abc7a218256805d1bfc
2019-11-28 02:19:08 -08:00
Aaron Huang
54861e8164 Merge "Add IpConfiguration parcelable interface implementation to system API" am: 9ff42e83d1
am: db770e3ed4

Change-Id: Ic5b8e360cb33cdd18f32a4d2c17beb996584ebda
2019-11-28 02:14:56 -08:00
Aaron Huang
db770e3ed4 Merge "Add IpConfiguration parcelable interface implementation to system API"
am: 9ff42e83d1

Change-Id: I3ead12ee9162c16f8f5937cfc74f38071cef41c9
2019-11-28 02:09:43 -08:00
Aaron Huang
9ff42e83d1 Merge "Add IpConfiguration parcelable interface implementation to system API" 2019-11-28 09:56:58 +00:00
Aaron Huang
1841dc26d5 Add IpConfiguration parcelable interface implementation to system API
API lint robot warnings that parcelable requires writeToParcel
and describeContents.

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

Change-Id: I7acf000c468788c3fdcb47f8601762e7804ab940
2019-11-28 07:25:40 +00:00
Hugo Benichi
97e58950a8 Merge "BitUtils: support packing/unpacking negative long values" am: d5930606d1 am: 12ebdfdc5a
am: 33dd2dc700

Change-Id: Iaa8c4084f0754781ea3e6a0a9202d9e102d5f074
2019-11-27 07:58:33 -08:00
Hugo Benichi
33dd2dc700 Merge "BitUtils: support packing/unpacking negative long values" am: d5930606d1
am: 12ebdfdc5a

Change-Id: If85ad67169295e8725d654966c4d0f42439f10c4
2019-11-27 07:52:49 -08:00
Hugo Benichi
12ebdfdc5a Merge "BitUtils: support packing/unpacking negative long values"
am: d5930606d1

Change-Id: Ibd0c4756fb0f888a506111bb2f33c60debe33d57
2019-11-27 07:46:56 -08:00
Treehugger Robot
d5930606d1 Merge "BitUtils: support packing/unpacking negative long values" 2019-11-27 15:34:46 +00:00
Hugo Benichi
72da2b0e43 BitUtils: support packing/unpacking negative long values
Bug: None
Test: Compiled. New unit tests.
Change-Id: Ia543285e206b0bbc7d64458da10e68a951f9eec1
2019-11-27 11:00:32 +09:00
Chiachang Wang
735e7fae8f Merge "Refactor based on new NetworkMonitor" am: 3ad444cb32 am: 27f97a21da
am: 28e85dcd62

Change-Id: I7b5bb41d2e5d99a81565506a4274a38156e3afc2
2019-11-26 04:15:47 -08:00
Chiachang Wang
28e85dcd62 Merge "Refactor based on new NetworkMonitor" am: 3ad444cb32
am: 27f97a21da

Change-Id: I631487e6ccc500dd921ec04fa82713f35523dce8
2019-11-26 04:10:13 -08:00
Chiachang Wang
27f97a21da Merge "Refactor based on new NetworkMonitor"
am: 3ad444cb32

Change-Id: I6f2f42dee11b2ee3db9e52817cd7aa871539aaed
2019-11-26 04:03:47 -08:00
Chiachang Wang
3ad444cb32 Merge "Refactor based on new NetworkMonitor" 2019-11-26 10:52:33 +00:00