Automerger Merge Worker
a22c41d787
Merge "Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a9b am: 672fa36bdd" into rvc-d1-dev-plus-aosp am: 7a5db197dc
...
Original change: undetermined
Change-Id: Iefb0bff5a646b267e4d60f644c4d924a0ca36c8f
2020-06-02 12:27:06 +00:00
Paul Duffin
fc7498be33
Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a9b am: 23926cc12a am: cfbb7c8157
...
Original change: undetermined
Change-Id: I5246c8b4611f366e170b0a53b9b736293de91213
2020-06-02 12:26:33 +00:00
Automerger Merge Worker
7a5db197dc
Merge "Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a9b am: 672fa36bdd" into rvc-d1-dev-plus-aosp
2020-06-02 12:12:10 +00:00
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
cfbb7c8157
Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a9b am: 23926cc12a
...
Original change: undetermined
Change-Id: I881cccf3f96b39731208b48b6ff615c21183991b
2020-06-02 12:11:25 +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
23926cc12a
Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a9b
...
Original change: undetermined
Change-Id: Ia56347e16ba637bbd4e23cfa664a7b78fe4aa52f
2020-06-02 11:58:45 +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
888c83f429
Merge "Gate exemptFromEentitlementCheck by Network_STACK permission" am: 650c23fdc2 am: dc1e33c9b3 am: 507e5320f1 am: c6f11fabb8
...
Original change: undetermined
Change-Id: Iedfaaec2629449c3c7a616a406dedce0571e2951
2020-06-02 04:32:14 +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
a7afb4bb86
Merge changes from topic "tether_offload_data_limit" am: 4155d2a6ad am: ff06ea7122 am: 4f0ab53a43 am: d672ae17b6
...
Original change: undetermined
Change-Id: Ie73f4c769ca252fe9065e7858cadbde7b720fd76
2020-06-02 00:34:14 +00:00
Hungming Chen
5c4d6d671e
[BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator am: b150b87fa9 am: b0f59dbbdf am: 0a7c8f1ec0 am: 5caae63ca9
...
Original change: undetermined
Change-Id: I3df9198c0f8a6cd265d38b2364b495852fd8c677
2020-06-02 00:34:10 +00:00
Hungming Chen
8e266536ce
[BOT.3] Add unit test for polling network stats in the coordinator am: 7997d691fe am: 5fd9fcce13 am: a3c8a7503c am: a665eaf548
...
Original change: undetermined
Change-Id: I0d26ea65258b2a724d6cbbda6bf2acda7820134d
2020-06-02 00:34:07 +00:00
Hungming Chen
7fe350dff7
[BOT.2] Create a coordinator and stats provider to provide tether stats am: 68f1c2a63f am: eba638f4a9 am: 8bebb8eaa5 am: 585394e243
...
Original change: undetermined
Change-Id: Ia3b49409646c4f9f8cc48804d10e056a4ce3ee7b
2020-06-02 00:34:03 +00:00
Hungming Chen
17bbcb6d3a
[BOT.1] Add a class ForwardedStats in TetheringUtils am: d0216998a4 am: e624037dd3 am: e5682257be am: 23a6cb16b6
...
Original change: undetermined
Change-Id: Iabd45ff82f1418248b8b77b80e89c143b8eecead
2020-06-02 00:33:55 +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
d2b3bc9885
[automerger skipped] Merge "Use Class#getSimpleName instead of KClass#getSimpleName" am: aac3b2ead0 am: ae18ba8e91 -s ours am: 5bc72a4816 -s ours am: aed7a0df3f -s ours
...
am skip reason: Change-Id I49bc336a276d30152402eba926cc583bc81e8e5c with SHA-1 6c633de59e is in history
Change-Id: I5d507b2285979f4e91803cc5d20689d382b9f428
2020-06-01 07:43:43 +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
Automerger Merge Worker
f2307d2b22
Merge "Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 408914d348 am: 4c2b381adb" into rvc-qpr-dev-plus-aosp
2020-05-31 14:59:20 +00:00
Paul Duffin
d097fb19b6
Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 4a93d5ea3a am: 669e1d848e
...
Change-Id: Ifd6593b8143280da4d5dcda6f457c330df4199d0
2020-05-31 14:59:01 +00:00
Paul Duffin
9b9cc8b44a
Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 408914d348 am: 4c2b381adb
...
Change-Id: I50ce359fd4195295dc9eee8df2f39bf536884330
2020-05-31 14:58:56 +00:00
Paul Duffin
005c6cad80
Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 408914d348 am: c610401918
...
Change-Id: I15eb542ecff199567da1d16e9d7c7bc2d1648563
2020-05-31 14:58:37 +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
ab1d772f7b
Merge "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 am: c291f57f0d -s ours" into rvc-qpr-dev-plus-aosp
2020-05-30 15:15:30 +00:00
Automerger Merge Worker
3751843bb8
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 am: c291f57f0d -s ours
...
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 2ecd333f59 is in history
Change-Id: Ie5fd4fd7a00935b82a1e253a190cf3ce3369adcb
2020-05-30 15:15:25 +00:00