Nucca Chen
fe737bc2b2
Merge "[BOT.11] BpfCoordinator could be disabled by device config" am: e8c985be78 am: 36e37ff125 am: d7f13cb23b am: 2ccef37a68 am: e6f8681f33
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313955
Change-Id: I48a8de478c9200b8c9f88e785340fc7973e4a13f
2020-06-17 07:03:39 +00:00
Nucca Chen
cb183c30cf
Merge "[BOT.8] Dump BPF offload information in dumpsys" am: e765ab3d36 am: 52d3db170e am: be3598c113 am: 7f90b4033b am: 4dab032009
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302438
Change-Id: Id4f11bacd0e3fd3c1b9426465e38d1f01fb4ecd6
2020-06-17 07:03:18 +00:00
Nucca Chen
3af4ef9ce5
Merge "[BOT.10] Add unit test for data limit and rule change in BpfCoordinator" am: 8392e11329 am: 0d295a8642 am: b079e02a39 am: 5b878baac3 am: e424cd0a18
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311659
Change-Id: I9e5ca6c6d61e35f0b65add90b19d59c05a77bf0f
2020-06-17 07:02:46 +00:00
Mark Chien
37867cc26b
Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 7e501e2967 am: bccb89a187 am: 36a6c56989
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350
Change-Id: Ic89fe046e75a76aebf05e47c8754010f52a45536
2020-06-17 07:02:13 +00:00
Nucca Chen
e6f8681f33
Merge "[BOT.11] BpfCoordinator could be disabled by device config" am: e8c985be78 am: 36e37ff125 am: d7f13cb23b am: 2ccef37a68
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313955
Change-Id: I3843d263700b65380e0d539a10b1e648415f8cf5
2020-06-17 06:50:27 +00:00
Nucca Chen
4dab032009
Merge "[BOT.8] Dump BPF offload information in dumpsys" am: e765ab3d36 am: 52d3db170e am: be3598c113 am: 7f90b4033b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302438
Change-Id: I2d4e850c395e1a3826e33e6c33ef73331e53fefd
2020-06-17 06:50:11 +00:00
Nucca Chen
e424cd0a18
Merge "[BOT.10] Add unit test for data limit and rule change in BpfCoordinator" am: 8392e11329 am: 0d295a8642 am: b079e02a39 am: 5b878baac3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311659
Change-Id: I16cba2d4b326767a7295667d601183cd47833018
2020-06-17 06:49:41 +00:00
Mark Chien
36a6c56989
Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 7e501e2967 am: bccb89a187
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350
Change-Id: I843709e8daa6ae49417cb1749d0880ffefda6cee
2020-06-17 06:49:06 +00:00
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
66cdc1f38e
Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17 am: edd4b50f58 am: cd1d6ff1ff am: f4d3d46981
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076
Change-Id: I46e9cc995a3b1fe9628f2487e969b87c2c2371c9
2020-06-17 03:33:08 +00:00
Mark Chien
f4d3d46981
Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17 am: edd4b50f58 am: cd1d6ff1ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076
Change-Id: I3e9712d214d5f58e14f06763f1e5dc91d8d60b2d
2020-06-17 03:15:37 +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
7bbe08ba15
Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: f1b2407490 am: ed00400645 am: 15b3733d62 am: f1d115a717
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348
Change-Id: I808eb799788015c11dade69ca62cbd1defddb2d6
2020-06-12 18:10:39 +00:00
Mark Chien
03a094dfce
Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: f1b2407490 am: b4ac5bc5b4 am: b05fa7f798 am: a7cec49bfc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348
Change-Id: I53318fdc3d116127dd9d22bb449b8868313a38ba
2020-06-12 18:10:27 +00:00
Mark Chien
f1d115a717
Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: f1b2407490 am: ed00400645 am: 15b3733d62
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348
Change-Id: Ic22410e095045d2ca71a78203eca9feabc85e1b5
2020-06-12 18:08:03 +00:00
Mark Chien
a7cec49bfc
Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: f1b2407490 am: b4ac5bc5b4 am: b05fa7f798
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348
Change-Id: Ia73e1fdbf77d04d45bda1b5486c18d8d837bf692
2020-06-12 18:07:42 +00: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
371bb614f1
Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 56a635ceb5 am: ad747f81bd am: dd9b25c143
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353
Change-Id: Idb554be4f0f858077245fc38e309e4e91dbf175f
2020-06-11 16:21:55 +00:00
TreeHugger Robot
161cffb309
Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 10ede1fcae am: b605d649f4 am: 21bc0cd211
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353
Change-Id: I17826a8e30c9773555fad9ce03144beaa352e45b
2020-06-11 16:20:18 +00:00
TreeHugger Robot
8613dab375
Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 56a635ceb5 am: aa0f47ccb3 am: 1f6f0a7743
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353
Change-Id: I9d0da41702117523bc1570ce9eead4283192b768
2020-06-11 16:19:17 +00:00
TreeHugger Robot
dd9b25c143
Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 56a635ceb5 am: ad747f81bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353
Change-Id: I6f0413279316aae198054ca1225b5eddbd242b4e
2020-06-11 15:58:39 +00:00
TreeHugger Robot
21bc0cd211
Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 10ede1fcae am: b605d649f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353
Change-Id: I0fead8f6fbab6e9594fc7380c959872c0ebb65b7
2020-06-11 15:57:44 +00:00
TreeHugger Robot
1f6f0a7743
Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 56a635ceb5 am: aa0f47ccb3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353
Change-Id: I4ad9c2e14018c888e9a0b27f0b16643f233a7f6b
2020-06-11 15:57:28 +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
d8f75212ea
[automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 am: 637de75575 -s ours am: db97500dd3 -s ours am: 1b86312490 -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: If06fe4314871da685be7be596ebb639004b0637e
2020-06-11 01:51:04 +00:00
Mark Chien
1f759d1257
[automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 -s ours am: ae4227ca95 -s ours am: 18cab6e6fb -s ours am: 57b62408c7 -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: I7943770f34c80c4b6c1f9ee7cb16bbeaffdb0bbd
2020-06-11 01:50:45 +00:00