Automerger Merge Worker
dfee3092f5
Merge "Merge "[BOT.4] Make BpfCoordinator to support data warning" am: cdf210fd71 am: 74b81e046c am: 4ac4347e8b" into rvc-d1-dev-plus-aosp am: 8b2df8df35
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302435
Change-Id: If732bcf0706801b4823c6f77231c832cbdbcc242
2020-06-09 02:59:27 +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
cdf210fd71
Merge "[BOT.4] Make BpfCoordinator to support data warning"
2020-06-09 02:22:43 +00:00
Paul Hu
0b985506fa
Merge "Make tether settings intent explicit" am: 51241a168c am: 913cd757d5 am: 98a32f115d am: aca14f6f73
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318286
Change-Id: I0885589d835011404af9d8c2d77a4d6212c8fd56
2020-06-08 16:47:01 +00:00
Xin Li
19df70dc15
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: d7785982ac -s ours am: 8028fe1945 -s ours am: 669666f430 -s ours am: 14beee853a -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: Id2777f3b97ff4733dfda185b8feceb4cc25330bc
2020-06-08 16:42:05 +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
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
26e400469e
[automerger skipped] Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." am: cfacebd651 am: 22238ed86f -s ours am: 9ceac21066 -s ours am: 076222e52c -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: If508f4b0f7ad5aae9326d6aed13355a1112f54bb
2020-06-03 06:13:43 +00: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
850351f75a
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 am: 92078a9dad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11620914
Change-Id: I3d84d2b62bda53240c70685dd972b9335f057ab3
2020-06-03 04:51:05 +00:00
TreeHugger Robot
61d59503ea
Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." into rvc-dev am: 36ff42e508 am: 07f6ff7138 am: a62f159413
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11620914
Change-Id: Ic1de00567516a34657893a4f309010c2aadf9b23
2020-06-03 04:50:51 +00:00
TreeHugger Robot
e98255490e
Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." into rvc-dev am: 36ff42e508 am: 07f6ff7138 am: 35f1bf6357
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11620914
Change-Id: I3fe08b0644b62b05987c4eb628264645b09a9e12
2020-06-03 04:49:49 +00: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
eccf132341
[automerger skipped] Merge "Switch to standard naming scheme" am: b04aea2791 am: 5b8f3bede8 -s ours am: 730b0510d6 -s ours am: b05be93970 -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: Ideb06f66c4b0242c3071718316fcab0090381bc0
2020-06-02 20:24:38 +00:00
Paul Duffin
9f9e489c85
[automerger skipped] Merge "Clean up the visibility rules for framework modules" am: 415e2387ae am: 94261519be -s ours am: 42dea5b4ea -s ours am: 9d4fcfedc3 -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: Ic617b73d9a48f814f65911f05d58b9bc70a7eeda
2020-06-02 20:23:47 +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
Automerger Merge Worker
1b9e4dca9a
Merge "[automerger skipped] Merge "Gate exemptFromEentitlementCheck by Network_STACK permission" into rvc-dev am: 905ad0070d -s ours am: 9e8fe26aa3 -s ours" into rvc-d1-dev-plus-aosp am: 31e750346f -s ours
...
am skip reason: Change-Id I6ddfda23d36ea9981e3e1eb5a87767f452a65852 with SHA-1 03b52fcfd5 is in history
Original change: undetermined
Change-Id: Ia7063b058ed8a425fa0f838a03338a00de05bf52
2020-06-02 15:47:15 +00:00
TreeHugger Robot
97bd9d9a6f
[automerger skipped] Merge "Gate exemptFromEentitlementCheck by Network_STACK permission" into rvc-dev am: 905ad0070d am: 2f6b53c989 -s ours am: 042be949de -s ours
...
am skip reason: Change-Id I6ddfda23d36ea9981e3e1eb5a87767f452a65852 with SHA-1 03b52fcfd5 is in history
Original change: undetermined
Change-Id: I444ebfd8c4fdecea913a4045af835a363b930de4
2020-06-02 15:46:03 +00:00
TreeHugger Robot
ec55a0a471
[automerger skipped] Merge "Gate exemptFromEentitlementCheck by Network_STACK permission" into rvc-dev am: 905ad0070d am: 2f6b53c989 am: e6f781e9e4 -s ours
...
am skip reason: Change-Id I6ddfda23d36ea9981e3e1eb5a87767f452a65852 with SHA-1 9e790873d9 is in history
Original change: undetermined
Change-Id: I3eec785ea60e6afeb0938e91a811644cc233628b
2020-06-02 15:45:31 +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
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