Commit Graph

1432 Commits

Author SHA1 Message Date
Treehugger Robot
b3debb2fd2 Merge "[BOT.6] Make BpfCoordinator to support data limit" am: 73dd6f71f8 am: 3e58ec268b am: fe3f85ba3d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302436

Change-Id: Ia746504d8299635b5418af4ecad21a49e844b7a2
2020-06-09 13:42:24 +00:00
Treehugger Robot
fe3f85ba3d Merge "[BOT.6] Make BpfCoordinator to support data limit" am: 73dd6f71f8 am: 3e58ec268b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302436

Change-Id: Icf64d856318173ad599a4f48295c9bdf591967f1
2020-06-09 13:28:38 +00:00
Treehugger Robot
73dd6f71f8 Merge "[BOT.6] Make BpfCoordinator to support data limit" 2020-06-09 12:58:20 +00:00
Mark Chien
afa80c5df1 Merge "Move TetheringTests to presubmit" am: 597265fa13 am: 6b63e8da67 am: 43e70468ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318279

Change-Id: Icbeb8e94e0ca4b1cba9c9d373f48209a3ee71a87
2020-06-09 09:38:39 +00:00
Hungming Chen
269c0886ed [BOT.6] Make BpfCoordinator to support data limit
The BPF tethering coordinator listens to the forwarding rule
changes for updating data limit which is applied in the following
conditions.
- After adding the first rule on a given upstream, add data limit.
- After removing the last rule on a given upstream, clear data limit.
- The service applies a new data limit on current upstream.

The reason for relying on rule changes is because the Tethering and
IpServer objects have multi-internal state machines. It is hard to
synchronize all of their states.

Note that the data limit cleanup for stopping or switching upstream
relies on offload rules are all removed as well.

Bug: 150736748
Test: manual
Change-Id: I829d36339973f9473fe6b616c48aa288f18d1c46
2020-06-09 17:33:03 +08:00
Mark Chien
43e70468ce Merge "Move TetheringTests to presubmit" am: 597265fa13 am: 6b63e8da67
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318279

Change-Id: I6cbfa15e623daef9dc70e764a4f701689209f1b2
2020-06-09 09:24:40 +00:00
Mark Chien
597265fa13 Merge "Move TetheringTests to presubmit" 2020-06-09 08:48:13 +00:00
Lorenzo Colitti
03bfac4fba Merge "[BOT.9] Add unit test for data warning in BpfCoordinator" am: fd349683c9 am: dd9f16708c am: 6ae789f577
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311658

Change-Id: I0ecf145dc8e0a87f014d6aad201cd50b6c7136bc
2020-06-09 03:02:37 +00:00
Lorenzo Colitti
6ae789f577 Merge "[BOT.9] Add unit test for data warning in BpfCoordinator" am: fd349683c9 am: dd9f16708c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311658

Change-Id: I5db2504e87edf3389dced385191cc250b88e2da0
2020-06-09 02:55:52 +00:00
Lorenzo Colitti
105b28d523 Merge "[BOT.4] Make BpfCoordinator to support data warning" am: cdf210fd71 am: 74b81e046c am: 4ac4347e8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302435

Change-Id: Ib23a75528a26cc48413c38c1e1aaf668eb0e8589
2020-06-09 02:55:46 +00:00
Lorenzo Colitti
4ac4347e8b Merge "[BOT.4] Make BpfCoordinator to support data warning" am: cdf210fd71 am: 74b81e046c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302435

Change-Id: I686b01c362ed61d7333279f4c951039afa9a2fbd
2020-06-09 02:55:01 +00:00
Lorenzo Colitti
fd349683c9 Merge "[BOT.9] Add unit test for data warning in BpfCoordinator" 2020-06-09 02:22:59 +00:00
Lorenzo Colitti
cdf210fd71 Merge "[BOT.4] Make BpfCoordinator to support data warning" 2020-06-09 02:22:43 +00:00
Paul Hu
aca14f6f73 Merge "Make tether settings intent explicit" am: 51241a168c am: 913cd757d5 am: 98a32f115d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318286

Change-Id: I6f93524a724167fd48edab49af027732eee13d74
2020-06-08 16:36:40 +00:00
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
Paul Hu
98a32f115d Merge "Make tether settings intent explicit" am: 51241a168c am: 913cd757d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318286

Change-Id: I7eafc623fcd88b9544756295d84c936c2ab2507a
2020-06-08 16:20:55 +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
Paul Hu
51241a168c Merge "Make tether settings intent explicit" 2020-06-08 10:31:21 +00:00
Hungming Chen
b1406cf0d6 [BOT.9] Add unit test for data warning in BpfCoordinator
Bug: 150736748
Test: atest BpfCoordinatorTest
Change-Id: Ic1f37de75b064d7c8717e1b496e13174bb8693ec
2020-06-08 17:31:51 +08:00
Hungming Chen
c42a0ffc0d [BOT.4] Make BpfCoordinator to support data warning
Invoke the existing polling thread to update data alert statistics.
Once the data alert limit has reached, trigger the notification.

Bug: 150736748
Test: BpfCoordinatorTest
Change-Id: Ibf25560ca2e9f003d8eba01361dc7d35ec1b1627
2020-06-08 17:31:34 +08:00
paulhu
3fe5434d19 Make tether settings intent explicit
Currently tethering notification is sending a pending intent for
redirecting user to tether settings page. However, this intent
is implicit that only create with
Settings.ACTION_TETHER_SETTINGS. For security reasons, this
intetnt should specify an explicit component to be delivered to.
Thus, specify the settings package name to this intent.

Test: atest TetheringTests
Bug: 156353008
Change-Id: I49187aee8a004caa890e2a73c0a28d280215c7d4
2020-06-08 06:04:19 +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