Xin Li
14beee853a
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: d7785982ac -s ours am: 8028fe1945 -s ours am: 669666f430 -s ours
...
am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 22238ed86f is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323623
Change-Id: Ie30658c18424bb30696876b4b4a103fe1c645ab7
2020-06-08 16:29:22 +00:00
Xin Li
669666f430
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: d7785982ac -s ours am: 8028fe1945 -s ours
...
am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 22238ed86f is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323623
Change-Id: I3811100a743b62c5a5e9f661647793b719824679
2020-06-08 16:08:03 +00:00
Xin Li
d56d89c8a6
Merge QQ3A.200605.002 into master
...
Bug: 158095402
Merged-In: I5e28537689d1a53e99f91eafd494eb3a0c890f46
Change-Id: I436ef37a509cbe56d02c6d8d3a38c776f4b4883f
2020-06-03 10:45:02 -07:00
Maciej Żenczykowski
076222e52c
[automerger skipped] Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." am: cfacebd651 am: 22238ed86f -s ours am: 9ceac21066 -s ours
...
am skip reason: Change-Id I76a75a16fa27b47d78816b2f9379ef4bb68beb00 with SHA-1 b5898ad53a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322377
Change-Id: I71201909585461cff1cfaa0ab0dc5e174b2230c8
2020-06-03 06:00:28 +00:00
Maciej Żenczykowski
9ceac21066
[automerger skipped] Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." am: cfacebd651 am: 22238ed86f -s ours
...
am skip reason: Change-Id I76a75a16fa27b47d78816b2f9379ef4bb68beb00 with SHA-1 b5898ad53a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322377
Change-Id: Ieb50a0aa01cf69e0d393d901e040ff0cd6ca4bbd
2020-06-03 05:48:31 +00:00
Maciej Żenczykowski
22238ed86f
Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." am: cfacebd651
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322377
Change-Id: I5e28537689d1a53e99f91eafd494eb3a0c890f46
2020-06-03 05:32:55 +00:00
Maciej Żenczykowski
cfacebd651
Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed."
2020-06-03 05:21:45 +00:00
Maciej Żenczykowski
f99d2a103d
Stop reducing RA advertised ipv6 mtu by 16 - not needed.
...
This effectively reverts:
commit da0fb1bca8
Author: Maciej Żenczykowski <maze@google.com >
Date: Wed Feb 19 01:24:39 2020 -0800
Reduce advertised ipv6 mtu by 16 to fit ethernet header
This is a temporary hack to workaround the inability of current
kernel's ebpf bpf_skb_change_mode() function to prefix a 14-byte
ethernet header on to a packet without going over the upstream
(source, rawip) interface's mtu *before* we bpf_redirect() to
the downstream (destination, ethernet) interface.
Test: build, atest, atest TetheringTests
Bug: 149816401
Test: flashed a flame with new kernel and it works at 1500 mtu
Bug: 149816401
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I76a75a16fa27b47d78816b2f9379ef4bb68beb00
Merged-In: I76a75a16fa27b47d78816b2f9379ef4bb68beb00
2020-06-02 22:20:39 -07:00
Automerger Merge Worker
92078a9dad
Merge "Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." into rvc-dev am: 36ff42e508 am: 2ab13c6e54" into rvc-d1-dev-plus-aosp
2020-06-03 04:37:26 +00:00
TreeHugger Robot
39e54fed80
Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." into rvc-dev am: 36ff42e508 am: 2ab13c6e54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11620914
Change-Id: Icaf4d01d69b6c06fc52e08c2164f49102ea042f1
2020-06-03 04:37:11 +00:00
TreeHugger Robot
a62f159413
Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." into rvc-dev am: 36ff42e508 am: 07f6ff7138
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11620914
Change-Id: I260a3aaf2d2511a1943125083414c5a3ef1e689e
2020-06-03 04:37:09 +00:00
TreeHugger Robot
07f6ff7138
Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." into rvc-dev am: 36ff42e508
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11620914
Change-Id: I36ff80bcb8e6d9f576c87084fc6feb79001bf594
2020-06-03 04:23:34 +00:00
TreeHugger Robot
2ab13c6e54
Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." into rvc-dev am: 36ff42e508
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11620914
Change-Id: I16f122fb61de1f03fa7bf163be8f5fea70ab59d7
2020-06-03 04:23:26 +00:00
TreeHugger Robot
36ff42e508
Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." into rvc-dev
2020-06-03 04:15:32 +00:00
Paul Duffin
b05be93970
[automerger skipped] Merge "Switch to standard naming scheme" am: b04aea2791 am: 5b8f3bede8 -s ours am: 730b0510d6 -s ours
...
am skip reason: Change-Id I3b78fcbcacc3df787e171d6eedeef1e51b087615 with SHA-1 6812c1b1ee is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322775
Change-Id: I235e3873020d3166689b22b38d7a0863ecc5bd42
2020-06-02 20:12:27 +00:00
Paul Duffin
9d4fcfedc3
[automerger skipped] Merge "Clean up the visibility rules for framework modules" am: 415e2387ae am: 94261519be -s ours am: 42dea5b4ea -s ours
...
am skip reason: Change-Id Icc9bc5a9ef86cf7ba0f15c2b2a4abd596ec9f640 with SHA-1 a17cf677b5 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322774
Change-Id: Ia2a52c9aa31c06005292d55a68f02bee4d88b322
2020-06-02 20:11:52 +00:00
Paul Duffin
730b0510d6
[automerger skipped] Merge "Switch to standard naming scheme" am: b04aea2791 am: 5b8f3bede8 -s ours
...
am skip reason: Change-Id I3b78fcbcacc3df787e171d6eedeef1e51b087615 with SHA-1 6812c1b1ee is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322775
Change-Id: I7144b03a68a8cda1d1933dd021b22140482e4266
2020-06-02 19:58:58 +00:00
Paul Duffin
42dea5b4ea
[automerger skipped] Merge "Clean up the visibility rules for framework modules" am: 415e2387ae am: 94261519be -s ours
...
am skip reason: Change-Id Icc9bc5a9ef86cf7ba0f15c2b2a4abd596ec9f640 with SHA-1 a17cf677b5 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322774
Change-Id: I2e263560749dc0cc89ed1a73d5266551afbe5e49
2020-06-02 19:58:29 +00:00
Paul Duffin
5b8f3bede8
Merge "Switch to standard naming scheme" am: b04aea2791
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322775
Change-Id: Ic1b75b3a6cd0db02d485ecd2ed3939d9faca8200
2020-06-02 19:41:30 +00:00
Paul Duffin
94261519be
Merge "Clean up the visibility rules for framework modules" am: 415e2387ae
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322774
Change-Id: If3a3993f35d4eb09aee4ab4ff04cd41c4d9c28ab
2020-06-02 19:41:03 +00:00
TreeHugger Robot
aa7940677a
[automerger skipped] Merge "Gate exemptFromEentitlementCheck by Network_STACK permission" into rvc-dev am: 905ad0070d -s ours am: 9e8fe26aa3 -s ours
...
am skip reason: Change-Id I6ddfda23d36ea9981e3e1eb5a87767f452a65852 with SHA-1 03b52fcfd5 is in history
Original change: undetermined
Change-Id: I9902681f20cd9f8b6fe1acec729d230dc57fd746
2020-06-02 15:33:53 +00:00
TreeHugger Robot
042be949de
[automerger skipped] Merge "Gate exemptFromEentitlementCheck by Network_STACK permission" into rvc-dev am: 905ad0070d am: 2f6b53c989 -s ours
...
am skip reason: Change-Id I6ddfda23d36ea9981e3e1eb5a87767f452a65852 with SHA-1 9e790873d9 is in history
Original change: undetermined
Change-Id: Icf28dcc2d75e485c5ac477da0bc3c52b5470969b
2020-06-02 15:33:11 +00:00
TreeHugger Robot
2f6b53c989
Merge "Gate exemptFromEentitlementCheck by Network_STACK permission" into rvc-dev am: 905ad0070d
...
Original change: undetermined
Change-Id: Ie82e3bf2716730f6532e3deb267da3f469f3ab6b
2020-06-02 15:21:44 +00:00
TreeHugger Robot
9e8fe26aa3
[automerger skipped] Merge "Gate exemptFromEentitlementCheck by Network_STACK permission" into rvc-dev am: 905ad0070d -s ours
...
am skip reason: Change-Id I6ddfda23d36ea9981e3e1eb5a87767f452a65852 with SHA-1 9e790873d9 is in history
Original change: undetermined
Change-Id: I2658349820385d9179107303d33605f5042e29c6
2020-06-02 15:21:21 +00:00
TreeHugger Robot
905ad0070d
Merge "Gate exemptFromEentitlementCheck by Network_STACK permission" into rvc-dev
2020-06-02 15:09:56 +00:00
Paul Duffin
dfc7fb7f75
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: I3896d7c91e937f503b49f5df011c21ee51219652
Merged-In: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
Merged-In: I3b78fcbcacc3df787e171d6eedeef1e51b087615
(cherry picked from adac7d2cc3 )
2020-06-02 14:15:28 +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
2a8d380f40
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
Merged-In: Icc9bc5a9ef86cf7ba0f15c2b2a4abd596ec9f640
(cherry picked from a17cf677b5 )
2020-06-02 11:41:07 +01: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
markchien
03b52fcfd5
Gate exemptFromEentitlementCheck by Network_STACK permission
...
Shell has TETHER_PRIVILEGED permission. To avoid any service to adopt
shell identity by lunching service with Shell process, gate
exemptFromEentitlementCheck by NETWORK_STACK.
Bug: 157702014
Test: atest TetheringCoverageTests
Change-Id: I6ddfda23d36ea9981e3e1eb5a87767f452a65852
Merged-In: I6ddfda23d36ea9981e3e1eb5a87767f452a65852
2020-06-02 14:46:06 +08: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