Commit Graph

1380 Commits

Author SHA1 Message Date
Paul Duffin
d8e8bb100d Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a9b am: 672fa36bdd
Original change: undetermined

Change-Id: I0d9dcedb3c6d9ed7bf98de86b48e49d620349c87
2020-06-02 12:11:55 +00:00
Paul Duffin
672fa36bdd Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a9b
Original change: undetermined

Change-Id: I57cffc68409c2e9b795b0c8732fecc9bbf33e113
2020-06-02 11:58:50 +00:00
Paul Duffin
6812c1b1ee Switch to standard naming scheme
Removes use of the special framework-modules naming scheme.

Bug: 155164730
Test: m java
Exempt-From-Owner-Approval: Build cleanup.
Change-Id: I3b78fcbcacc3df787e171d6eedeef1e51b087615
Merged-In: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
(cherry picked from 8b864fb45ce79051437f13c2a19510718ea3b7aa)
2020-06-02 06:53:53 +00:00
Treehugger Robot
c6f11fabb8 Merge "Gate exemptFromEentitlementCheck by Network_STACK permission" am: 650c23fdc2 am: dc1e33c9b3 am: 507e5320f1
Original change: undetermined

Change-Id: I65cdcde8c7d69acffbb546142984db7d529fbfa6
2020-06-02 04:20:13 +00:00
Treehugger Robot
507e5320f1 Merge "Gate exemptFromEentitlementCheck by Network_STACK permission" am: 650c23fdc2 am: dc1e33c9b3
Original change: undetermined

Change-Id: Ic64b4551e70338bb1b81f9d9471f85cfa1c30bf3
2020-06-02 04:01:09 +00:00
Treehugger Robot
dc1e33c9b3 Merge "Gate exemptFromEentitlementCheck by Network_STACK permission" am: 650c23fdc2
Original change: undetermined

Change-Id: I7dc479b54bbcb511b68a59d6f70f880e32c309bc
2020-06-02 03:48:14 +00:00
Treehugger Robot
650c23fdc2 Merge "Gate exemptFromEentitlementCheck by Network_STACK permission" 2020-06-02 03:31:24 +00:00
Nucca Chen
d672ae17b6 Merge changes from topic "tether_offload_data_limit" am: 4155d2a6ad am: ff06ea7122 am: 4f0ab53a43
Original change: undetermined

Change-Id: I037c305244aa968aa7e02c8de0136a5fbc14a1f6
2020-06-02 00:15:24 +00:00
Hungming Chen
5caae63ca9 [BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator am: b150b87fa9 am: b0f59dbbdf am: 0a7c8f1ec0
Original change: undetermined

Change-Id: Ie87121d947a8c490042db8dc8d511652cc79aad6
2020-06-02 00:15:14 +00:00
Hungming Chen
a665eaf548 [BOT.3] Add unit test for polling network stats in the coordinator am: 7997d691fe am: 5fd9fcce13 am: a3c8a7503c
Original change: undetermined

Change-Id: Idc22c3e83df64f52cc6efc0770ded75ad274ab5b
2020-06-02 00:15:10 +00:00
Hungming Chen
585394e243 [BOT.2] Create a coordinator and stats provider to provide tether stats am: 68f1c2a63f am: eba638f4a9 am: 8bebb8eaa5
Original change: undetermined

Change-Id: Iff7cd2af01fbbffa1967c2f91c9961187cd73eaa
2020-06-02 00:15:06 +00:00
Hungming Chen
23a6cb16b6 [BOT.1] Add a class ForwardedStats in TetheringUtils am: d0216998a4 am: e624037dd3 am: e5682257be
Original change: undetermined

Change-Id: I9e867d438cb2a4fbb300d7269040ba7033fb8594
2020-06-02 00:15:02 +00:00
Nucca Chen
4f0ab53a43 Merge changes from topic "tether_offload_data_limit" am: 4155d2a6ad am: ff06ea7122
Original change: undetermined

Change-Id: Id9ba87f230591ad969d9de4661e180ac1184f5e3
2020-06-02 00:13:51 +00:00
Hungming Chen
0a7c8f1ec0 [BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator am: b150b87fa9 am: b0f59dbbdf
Original change: undetermined

Change-Id: I3b54b2e2c0f9353367c6a096ccfebf17a47f5bc6
2020-06-02 00:13:45 +00:00
Hungming Chen
a3c8a7503c [BOT.3] Add unit test for polling network stats in the coordinator am: 7997d691fe am: 5fd9fcce13
Original change: undetermined

Change-Id: Ib9ad6e1ab139295ef603e7c8ec86d689ea9801af
2020-06-02 00:13:40 +00:00
Hungming Chen
8bebb8eaa5 [BOT.2] Create a coordinator and stats provider to provide tether stats am: 68f1c2a63f am: eba638f4a9
Original change: undetermined

Change-Id: Ic7fe1a8c0d16c8b435269a1973687655a9c7412b
2020-06-02 00:13:26 +00:00
Hungming Chen
e5682257be [BOT.1] Add a class ForwardedStats in TetheringUtils am: d0216998a4 am: e624037dd3
Original change: undetermined

Change-Id: Ia1847c5b25a429b16ce1d2bae265b299ec31a8a9
2020-06-02 00:13:20 +00:00
Nucca Chen
ff06ea7122 Merge changes from topic "tether_offload_data_limit" am: 4155d2a6ad
Original change: undetermined

Change-Id: Ibb464a45669213e1e0918367878f07bc1220ad8d
2020-06-01 23:53:10 +00:00
Hungming Chen
b0f59dbbdf [BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator am: b150b87fa9
Original change: undetermined

Change-Id: I0cfdf1e9f68057a4066b09be47d56e7537b2aa3d
2020-06-01 23:53:04 +00:00
Hungming Chen
5fd9fcce13 [BOT.3] Add unit test for polling network stats in the coordinator am: 7997d691fe
Original change: undetermined

Change-Id: Ic3b56365d7f1dbde23e0d1b902a21a3de3ad7327
2020-06-01 23:52:56 +00:00
Hungming Chen
eba638f4a9 [BOT.2] Create a coordinator and stats provider to provide tether stats am: 68f1c2a63f
Original change: undetermined

Change-Id: I21fe5385b8cdfe2ce2ff982884d72a398183bde3
2020-06-01 23:52:53 +00:00
Hungming Chen
e624037dd3 [BOT.1] Add a class ForwardedStats in TetheringUtils am: d0216998a4
Original change: undetermined

Change-Id: Iaba770ec498db0732246549bb276dfcd8f3bc90a
2020-06-01 23:52:45 +00:00
Nucca Chen
4155d2a6ad Merge changes from topic "tether_offload_data_limit"
* changes:
  Make tethering module to use netd_aidl_interface-unstable-java
  [BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator
  [BOT.3] Add unit test for polling network stats in the coordinator
  [BOT.2] Create a coordinator and stats provider to provide tether stats
  [BOT.1] Add a class ForwardedStats in TetheringUtils
2020-06-01 23:33:24 +00:00
Paul Hu
aed7a0df3f [automerger skipped] Merge "Use Class#getSimpleName instead of KClass#getSimpleName" am: aac3b2ead0 am: ae18ba8e91 -s ours am: 5bc72a4816 -s ours
am skip reason: Change-Id I49bc336a276d30152402eba926cc583bc81e8e5c with SHA-1 6c633de59e is in history

Change-Id: I191829606d832ad1bf676ffbc0670c74d5e23547
2020-06-01 07:28:03 +00:00
Paul Hu
5bc72a4816 [automerger skipped] Merge "Use Class#getSimpleName instead of KClass#getSimpleName" am: aac3b2ead0 am: ae18ba8e91 -s ours
am skip reason: Change-Id I49bc336a276d30152402eba926cc583bc81e8e5c with SHA-1 6c633de59e is in history

Change-Id: I3daa7e0ca0e035c83d1e2f2ac839cebfae33d2fe
2020-06-01 07:16:32 +00:00
Paul Hu
ae18ba8e91 Merge "Use Class#getSimpleName instead of KClass#getSimpleName" am: aac3b2ead0
Change-Id: Ica9acc5b0df4a781a05ae49122978b8ce85b85d3
2020-06-01 06:59:48 +00:00
Paul Hu
aac3b2ead0 Merge "Use Class#getSimpleName instead of KClass#getSimpleName" 2020-06-01 06:43:13 +00:00
Paul Duffin
669e1d848e Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 4a93d5ea3a
Change-Id: I8ff6bb1b049f96d71612020adccd8c4a6888c178
2020-05-31 14:46:00 +00:00
Paul Duffin
c610401918 Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 408914d348
Change-Id: Ib58ede3af2e2c12b7c5a4fdfde3f74a595e229b4
2020-05-31 14:45:39 +00:00
Paul Duffin
4a93d5ea3a Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5
Change-Id: I385b2d13d96fd34c8fe031994d56de3763fe3917
2020-05-31 14:25:37 +00:00
Paul Duffin
408914d348 Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5
Change-Id: I43891381685098f03005500e9049972c1a3c1b39
2020-05-31 14:25:06 +00:00
Paul Duffin
a17cf677b5 Clean up the visibility rules for framework modules
Switching from java_library to java_sdk_library switched the meaning
of the module name from referring to the implementation library to
referring to the stubs. This change updates the visibility rules to
reflect that new meaning.

Visibility rules that were previously set for the java_library have
been moved to the impl_library_visibility property and the special
//visibility:override value has been prepended to prevent it from
inheriting the values from the visibility property.

Visibility rules set for the stubs (via stubs_library_visibility)
property have been moved to the visibility property.

Bug: 155164730
Test: m nothing
Exempt-From-Owner-Approval: Build cleanup
Change-Id: Icc9bc5a9ef86cf7ba0f15c2b2a4abd596ec9f640
2020-05-31 13:45:51 +01:00
Automerger Merge Worker
c291f57f0d Merge "[automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 am: 8b5a29a30f -s ours" into rvc-d1-dev-plus-aosp 2020-05-30 15:03:41 +00:00
Mark Chien
0966a74414 [automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 -s ours am: a6d948cf73 -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 c9daba32f7 is in history

Change-Id: I7a42ee0b98c9f4b7251b2673609ed89e81722aac
2020-05-30 15:03:34 +00:00
Mark Chien
34656783de [automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 am: 8b5a29a30f -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 c9daba32f7 is in history

Change-Id: I18f6a7b449cffb0e1d6069a0abae15c76396ba72
2020-05-30 15:03:31 +00:00
Mark Chien
8b5a29a30f Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63
Change-Id: I87c8cc92a78ba7bd17581c23e1603ac47391e96e
2020-05-30 14:47:07 +00:00
Mark Chien
a6d948cf73 [automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 c9daba32f7 is in history

Change-Id: I99ca97c91bf2f3705b7295d14f5ddb84d29c84c0
2020-05-30 14:46:40 +00:00
Mark Chien
2ecd333f59 Tethering: ensure downstream prefix do not conflict with upstream
- Add New class PrivateAddressCoordinator to coordinate the private
  address conflict problem.
- Downstream prefix would be random in 192.168.0.0/24 ~
  192.168.255.0/24.
- If new upstream prefix is conflict with existing downstream prefix,
  downstream would be kicked out and it would request a new one.
- The last conflict upstream prefixes would be blacklist. Avoid to
select downstream prefix which is conflict with prefixes in blacklist.

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

Merged-In: Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5
Change-Id: Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5
2020-05-30 03:42:57 +00:00
Mark Chien
df94b648c8 Merge "Tethering: ensure downstream prefix do not conflict with upstream" am: 7bf51619d8 am: 3cefc6e048 am: 0e1a1f4c68
Change-Id: Ib77ca516f83ac552429573178f63d08ccfce008e
2020-05-29 22:26:13 +00:00
Mark Chien
0e1a1f4c68 Merge "Tethering: ensure downstream prefix do not conflict with upstream" am: 7bf51619d8 am: 3cefc6e048
Change-Id: Ib70a471603d850069aae029dea7fc09a9b28f4bc
2020-05-29 22:07:37 +00:00
Mark Chien
3cefc6e048 Merge "Tethering: ensure downstream prefix do not conflict with upstream" am: 7bf51619d8
Change-Id: I55ff57be344e17d3ce16cda7291f7f29f26191b1
2020-05-29 21:42:11 +00:00
Hungming Chen
140042db6f Make tethering module to use netd_aidl_interface-unstable-java
Use unstable aidl for new api tetherOffload* and modified
parcel TetherStatsParcel in BpfCoordinator{, Test}.

Bug: 150736748
Test: m

Change-Id: I2d2cedf560319653f67f6b06f7abb0bf66eba91a
2020-05-29 20:24:02 +08:00
Hungming Chen
b150b87fa9 [BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator
This is a preparation for moving adding/removing forwarding rules from
IpServer to BpfCoordinator.

Bug: 150736748
Test: atest IpServerTest
Change-Id: I85316ef09ff3c9389ded11dcc384493d699da48e
2020-05-29 20:23:40 +08:00
Hungming Chen
7997d691fe [BOT.3] Add unit test for polling network stats in the coordinator
Verify that the coordinator could fetch tether stats from BPF maps and
report the network stats to the service.

Bug: 150736748
Test: atest BpfCoordinatorTest
Change-Id: Ib1756159a2047c5db7d31359b0f288f840bd1bb1
2020-05-29 20:23:31 +08:00
Hungming Chen
68f1c2a63f [BOT.2] Create a coordinator and stats provider to provide tether stats
Make BPF tethering offload coordinator, BpfCoordinator,
registers a network stats provider, BpfTetherStatsProvider, and
provide the tethering stats from the BPF map.

Bug: 150736748
Test: new test BpfCoordinatorTest

Change-Id: I22e71f87b67668f7e733e4f215d93bf5b2c9380d
2020-05-29 20:23:22 +08:00
Hungming Chen
d0216998a4 [BOT.1] Add a class ForwardedStats in TetheringUtils
Used to record offload transmitted/received forwarded bytes/packets.

Bug: 150736748
Test: new test BpfTetheringCoordinatorTest
Change-Id: Ie8725f95c3ddd5fb3811d479de32d2c1f7dcb493
2020-05-29 20:23:14 +08:00
Chalard Jean
5ba4e8018e Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: 88c69840cd am: 601193a68e
Change-Id: If2085438daf43081c67d5174aca07ed7e3055327
2020-05-29 09:51:40 +00:00
Chalard Jean
fe32a82433 Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: 88c69840cd am: 04fb018acc
Change-Id: Idfe54387a331f532040ea3986eb7948e24ea7304
2020-05-29 09:51:14 +00:00
Chalard Jean
04fb018acc Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: 88c69840cd
Change-Id: I085ccc0a27d07489daeb91e13c23ccf58e3f7bc0
2020-05-29 09:25:22 +00:00
Chalard Jean
601193a68e Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: 88c69840cd
Change-Id: Ice90dba6408eca9c031592fd4933a107fdbbec2f
2020-05-29 09:24:53 +00:00