Nucca Chen
2ccef37a68
Merge "[BOT.11] BpfCoordinator could be disabled by device config" am: e8c985be78 am: 36e37ff125 am: d7f13cb23b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313955
Change-Id: Ia741c126d73ec9a2dd4cbe77012c727be3c037d7
2020-06-17 06:38:41 +00:00
Nucca Chen
7f90b4033b
Merge "[BOT.8] Dump BPF offload information in dumpsys" am: e765ab3d36 am: 52d3db170e am: be3598c113
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302438
Change-Id: I49d9d3fcf481993466e49dc4a7fc9b4590cc2f02
2020-06-17 06:38:22 +00:00
Nucca Chen
5b878baac3
Merge "[BOT.10] Add unit test for data limit and rule change in BpfCoordinator" am: 8392e11329 am: 0d295a8642 am: b079e02a39
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311659
Change-Id: I4605077e115f200f1808403307131ff8c2a82d01
2020-06-17 06:37:57 +00:00
Mark Chien
bccb89a187
Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 7e501e2967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350
Change-Id: Ie42e9d3f4310bc8e42eafda1e420bcdc3d8557f5
2020-06-17 06:37:33 +00:00
Nucca Chen
d7f13cb23b
Merge "[BOT.11] BpfCoordinator could be disabled by device config" am: e8c985be78 am: 36e37ff125
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313955
Change-Id: If0f1df54216517aff5af0ce4ae120b25d7fdbaf6
2020-06-17 06:32:52 +00:00
Nucca Chen
be3598c113
Merge "[BOT.8] Dump BPF offload information in dumpsys" am: e765ab3d36 am: 52d3db170e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302438
Change-Id: Ifd56fe444a7610736eb9f915f8df70f73eec8c02
2020-06-17 06:32:35 +00:00
Nucca Chen
b079e02a39
Merge "[BOT.10] Add unit test for data limit and rule change in BpfCoordinator" am: 8392e11329 am: 0d295a8642
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311659
Change-Id: I9e6a6c89a080d7b168d31f390cc6241c252e7341
2020-06-17 06:31:45 +00:00
Mark Chien
7e501e2967
Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350
Change-Id: Ibfea2e6f2564942eca60c84a5df5583acc1b9e8b
2020-06-17 06:24:22 +00:00
Mark Chien
404c3adad7
Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev
2020-06-17 06:07:52 +00:00
Mark Chien
cd1d6ff1ff
Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17 am: edd4b50f58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076
Change-Id: I2b5b8b9054561a8e9a288cb15465ede56e4a9754
2020-06-17 02:58:21 +00:00
Mark Chien
edd4b50f58
Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076
Change-Id: I1d9075a7c112dd1345d6a8dacf343886dc1b286b
2020-06-17 02:47:31 +00:00
markchien
017bfba0d8
Protect invalid entitlement app configuration
...
There is a protection in Settings that Settings would gray out if
tethering requires entitlement check but the entitlement app is
invalid. Tethering resource is moved from framework to tethering
module, so Settings can not fetch entitlement app name anymore.
In this change, tethering module would check whether entitltement app
package name is exsited if entitlement check is needed. Tethering would
be not supported (Settings tethering option would be hidded) if
entitlement app is not installed.
After moving the protection into tethering module,
TetherUtil#isProvisioningNeeded is no longer needed. Because The
only use case is Settings wants to gray out tethering setting
when entitltement check is needed but entitlement app is invalid.
Bug: 146918263
Test: atest TetheringCoverageTests
Change-Id: I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6
2020-06-16 19:06:34 +08:00
Mark Chien
c55e229dcb
Revert "Revert "Pass entitlement configuration to Settings for entitlement check""
...
Add commit message here for reference:
Tethering resource configuration is move from framework to tethering
module. The resource would not be accessible from outside of tethering
module.
List the replacements of framework resources usage and intent extra:
1. R.string.config_mobile_hotspot_provision_response
--> android.net.extra.TETHER_PROVISIONING_RESPONSE.
2. R.string.config_mobile_hotspot_provision_app_no_ui
--> android.net.extra.TETHER_UI_PROVISIONING_APP_NAME
3. R.array.config_mobile_hotspot_provision_app
--> android.net.extra.TETHER_SILENT_PROVISIONING_ACTION
Besides, the current active subId would put in
android.net.extra.TETHER_SUBID
Note: They are not APIs because of API freeze. Now both tethering module
and Settings define these strings independently.
Bug: 146918263
Test: atest TetherServiceTest
atest TetherProvisioningActivityTest
This reverts commit 9988903174 .
Reason for revert: Resume the CL and put this CL with settings part in the same topic to avoid break.
Change-Id: I114b4c258743661df51e5a969e150047a292e035
2020-06-15 16:38:53 +00:00
Hungming Chen
519f1201ca
[BOT.11] BpfCoordinator could be disabled by device config
...
Bug: 150736748
Test: BpfCoordinatorTest
Change-Id: Id413b7f2f7edb2e5c3e02d5677fe536ed52fbbcb
2020-06-15 21:16:26 +08:00
Hungming Chen
e571cfd53f
[BOT.8] Dump BPF offload information in dumpsys
...
$ adb shell dumpsys tethering
BPF offload:
Polling started
Stats provider registered
Upstream quota: {rmnet_data2=9223372036854775807}
Forwarding stats:
12(rmnet_data2) - ForwardedStats(rxb: 1065, rxp: 5, txb: 0, txp: 0)
Forwarding rules:
[wlan1]: iif(iface) oif(iface) v6addr srcmac dstmac
12(rmnet_data2) 31(wlan1) /2401:e180:8831:77ae:a900:a03b:41fb..
Bug: 150736748
Test: Enable tethering on mobile data and check dumpsys tethering
Change-Id: I95ea3050d92f3ba8136a63cd399d3450d183c8dc
2020-06-15 21:14:28 +08:00
Mark Chien
15b3733d62
Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: f1b2407490 am: ed00400645
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348
Change-Id: Ibdc5483f00a8554db0c00e9163b527e6f3973b85
2020-06-12 18:03:35 +00:00
Mark Chien
b05fa7f798
Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: f1b2407490 am: b4ac5bc5b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348
Change-Id: I802dd4ee567f4210b2ad36287ff20ee706800c6d
2020-06-12 17:55:55 +00:00
Mark Chien
ed00400645
Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: f1b2407490
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348
Change-Id: Ifa96dbf15a2c96b7c1fc9af39c8270707864470b
2020-06-12 17:45:43 +00:00
Mark Chien
b4ac5bc5b4
Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: f1b2407490
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348
Change-Id: I9436ba6a4fe7ef3eb38316d831e047957302bc49
2020-06-12 17:45:36 +00:00
Mark Chien
f1b2407490
Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev
2020-06-12 17:33:24 +00:00
Mark Chien
9988903174
Revert "Pass entitlement configuration to Settings for entitlement check"
...
Original CL has dependencies with unmerged settings change: https://googleplex-android-review.git.corp.google.com/c/platform/packages/apps/Settings/+/11524847
They should be in the same topic, revert it first. Will resume it and put the same with settings part CL.
This reverts commit 217d7b01f8 .
Reason for revert: This break hotspot because it should merged with settings part together.
Bug: 158836492
Change-Id: I94d3ee25168cfb3d125030654c4bb8ddd670abfc
2020-06-12 15:29:39 +00:00
TreeHugger Robot
ad747f81bd
Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 56a635ceb5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353
Change-Id: I0d326e4d6903469a6dd398ce4a2c6117c63b1f36
2020-06-11 15:45:20 +00:00
TreeHugger Robot
b605d649f4
Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 10ede1fcae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353
Change-Id: Ia9a0de93d250d0e153d467224a705af3f58e5501
2020-06-11 15:42:40 +00:00
TreeHugger Robot
56a635ceb5
Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353
Change-Id: I332e6f8965c1571508b310115c45cd4588c933ea
2020-06-11 15:15:15 +00:00
TreeHugger Robot
10ede1fcae
Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353
Change-Id: I213f7fa7116f58ae63cb32ecbf9f62e8306a83d2
2020-06-11 15:14:42 +00:00
TreeHugger Robot
03cfdd49b6
Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev
2020-06-11 15:00:57 +00:00
Hungming Chen
47f7a44350
[BOT.10] Add unit test for data limit and rule change in BpfCoordinator
...
The applying data limit is based on the forwarding rule changes.
Add the tests for verifying their interactions with netd.
Bug: 150736748
Test: BpfCoordinatorTest
Change-Id: I5a98c4cd74e2de6005ee05defa761f6af3fd4e75
2020-06-11 19:53:36 +08:00
markchien
217d7b01f8
Pass entitlement configuration to Settings for entitlement check
...
Tethering resource configuration is move from framwork to tethering
module. Since tethering resource would not be accessible from outside
of tethering module, EntitlementManager would tell Settings the
entitlement configuration via intent extra when run entitlement check.
Bug: 146918263
Test: atest TetheringTests
Change-Id: I6f23553bb1da5f0b767f920b32a86fafb9e00b9e
2020-06-11 13:53:27 +08:00
Mark Chien
db97500dd3
[automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 am: 637de75575 -s ours
...
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 0fffc85052 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818359
Change-Id: I9e40516a92566660e8c78a6759bfdc344ff19256
2020-06-11 01:45:30 +00:00
Mark Chien
18cab6e6fb
[automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 -s ours am: ae4227ca95 -s ours
...
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 8e2f49b3da is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818359
Change-Id: I02cf4f9233b7f43b92b5ca06e63f09f575b0956b
2020-06-11 01:44:49 +00:00
Mark Chien
637de75575
Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818359
Change-Id: I839176744df185f47b0020ce7c3f74084934bd55
2020-06-11 01:38:37 +00:00
Mark Chien
ae4227ca95
[automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 -s ours
...
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 8e2f49b3da is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818359
Change-Id: Ifbc27109febcaa49a6378ee3c3f8e54a444cc091
2020-06-11 01:37:43 +00:00
Mark Chien
ccf1551ed0
Merge "Move TetheringTests to presubmit" into rvc-dev
2020-06-11 01:35:38 +00:00
TreeHugger Robot
089b4078b5
[automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 -s ours am: 1a3a459639 -s ours
...
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 5a07338239 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11596544
Change-Id: Ia99757195a8359a700a5dd0bf692ff954d623c4c
2020-06-10 18:27:08 +00:00
TreeHugger Robot
c5e6b206a4
[automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 am: 8bc0ca8c74 -s ours
...
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 3fe5434d19 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11596544
Change-Id: I77d1d15d284190ee98321f7dfb8eaf8abd367fb9
2020-06-10 18:25:26 +00:00
TreeHugger Robot
8bc0ca8c74
Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11596544
Change-Id: I73dbaf73122522f7385520a8cee46c9299853b7c
2020-06-10 18:09:43 +00:00
TreeHugger Robot
1a3a459639
[automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 -s ours
...
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 3fe5434d19 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11596544
Change-Id: I8aa04d98967bc31dafdf7265e65b994274daf868
2020-06-10 18:09:36 +00:00
TreeHugger Robot
34d101b450
Merge "Make tether settings intent explicit" into rvc-dev
2020-06-10 17:47:19 +00:00
paulhu
5a07338239
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
Merged-In: I49187aee8a004caa890e2a73c0a28d280215c7d4
2020-06-10 23:48:13 +08:00
TreeHugger Robot
8188870684
[automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 am: c6298512e4 -s ours
...
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 7c538fa7ff is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818540
Change-Id: I3ed8753a3636e54d5e9c86b14a642f8bff62307d
2020-06-10 07:04:31 +00:00
Lorenzo Colitti
e7b6ad5bfc
[automerger skipped] [BOT.9] Add unit test for data warning in BpfCoordinator am: 1aa15dab62 am: 40e28391e5 -s ours
...
am skip reason: Change-Id Ic1f37de75b064d7c8717e1b496e13174bb8693ec with SHA-1 1aa15dab62 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818918
Change-Id: I9d2bfe44f055fd813a0a9284117ee14fbde72b9d
2020-06-10 07:04:28 +00:00
Lorenzo Colitti
1d7c1bded8
[automerger skipped] [BOT.4] Make BpfCoordinator to support data warning am: 11b88351c0 am: d0ca099573 -s ours
...
am skip reason: Change-Id Ibf25560ca2e9f003d8eba01361dc7d35ec1b1627 with SHA-1 11b88351c0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818381
Change-Id: I807b6c43b359acc8079fe08de23dcdda2ad50c66
2020-06-10 07:04:24 +00:00
Hungming Chen
2496028dee
[automerger skipped] [BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator am: 810a381cd4 am: 41c971a024 -s ours
...
am skip reason: Change-Id I85316ef09ff3c9389ded11dcc384493d699da48e with SHA-1 810a381cd4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818380
Change-Id: I4766b5518c21c2d1d69c365035530bdbe1d39b57
2020-06-10 07:04:20 +00:00
Hungming Chen
8d4bbf4f2f
[automerger skipped] [BOT.3] Add unit test for polling network stats in the coordinator am: 6442858f9d am: a2f02c617e -s ours
...
am skip reason: Change-Id Ib1756159a2047c5db7d31359b0f288f840bd1bb1 with SHA-1 6442858f9d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818379
Change-Id: Idec97ca9bda2f0f1d35605a58cfd480ef289b087
2020-06-10 07:04:11 +00:00
Hungming Chen
9269de4a72
[automerger skipped] [BOT.2] Create a coordinator and stats provider to provide tether stats am: d50f53b58a am: 81d15877d4 -s ours
...
am skip reason: Change-Id I22e71f87b67668f7e733e4f215d93bf5b2c9380d with SHA-1 d50f53b58a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818539
Change-Id: Icaf300354c46be86ded8e61f5710d9cf8237820d
2020-06-10 07:04:06 +00:00
Hungming Chen
fa2109f84a
[automerger skipped] [BOT.1] Add a class ForwardedStats in TetheringUtils am: 020cb554f5 am: 3b29ab8c1b -s ours
...
am skip reason: Change-Id Ie8725f95c3ddd5fb3811d479de32d2c1f7dcb493 with SHA-1 020cb554f5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818818
Change-Id: I4b83375e92077a3657f2ead9953765c13ac39e51
2020-06-10 07:03:57 +00:00
TreeHugger Robot
9cff08e68b
[automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 -s ours am: ea022aada2 -s ours
...
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 269c0886ed is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818540
Change-Id: I45b4d22af8275d69c045fe7a6705381e3394ca14
2020-06-10 07:03:06 +00:00
TreeHugger Robot
c6298512e4
Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818540
Change-Id: If839b5722aa8a648e5b97d4c0ef7a111a0754631
2020-06-10 06:55:05 +00:00
Lorenzo Colitti
40e28391e5
[BOT.9] Add unit test for data warning in BpfCoordinator am: 1aa15dab62
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818918
Change-Id: Ia561692d2405b59d7518bcd4bc18b4a3e5ee1943
2020-06-10 06:54:56 +00:00
Lorenzo Colitti
d0ca099573
[BOT.4] Make BpfCoordinator to support data warning am: 11b88351c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818381
Change-Id: I945ba8844fa6f666772cd8a968ba06f00ea8e360
2020-06-10 06:54:53 +00:00