Junyu Lai
a853fde945
[automerger skipped] Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504 am: ab2a5cd02f -s ours am: 655aaef84b -s ours
...
am skip reason: Merged-In I0b02d01cd8749d81c9d020dee7fdb4f80e18ae98 with SHA-1 36aa3f237c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006
Change-Id: I174fa67ee0f27cd6024fc40abeb3cecd248af5f0
2021-05-14 03:47:50 +00:00
Nucca Chen
1ad951705f
Merge "bpf: Add interface index to BPF devmap" am: aa10ddfa6f am: 72bd34e343 am: 76cc470496 am: 1ed7317a2f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703125
Change-Id: I3399596926792ae3433d9b4b2860bd1b5f334577
2021-05-14 03:47:39 +00:00
Junyu Lai
09a87eb28c
[automerger skipped] Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504 am: d1c8af2783 -s ours am: d0fc569f67 -s ours
...
am skip reason: Merged-In I0b02d01cd8749d81c9d020dee7fdb4f80e18ae98 with SHA-1 36aa3f237c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006
Change-Id: I3496a49dd6c65e7e6d1da3a4084b760143335cc2
2021-05-14 03:47:19 +00:00
Junyu Lai
655aaef84b
[automerger skipped] Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504 am: ab2a5cd02f -s ours
...
am skip reason: Merged-In I0b02d01cd8749d81c9d020dee7fdb4f80e18ae98 with SHA-1 36aa3f237c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006
Change-Id: If646033a664673f26961a7d7f35fce865e2a6794
2021-05-14 03:26:19 +00:00
Nucca Chen
1ed7317a2f
Merge "bpf: Add interface index to BPF devmap" am: aa10ddfa6f am: 72bd34e343 am: 76cc470496
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703125
Change-Id: I5669ff227f761da71d8ad12cf7e0a228b3621d81
2021-05-14 03:25:05 +00:00
Junyu Lai
d0fc569f67
[automerger skipped] Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504 am: d1c8af2783 -s ours
...
am skip reason: Merged-In I0b02d01cd8749d81c9d020dee7fdb4f80e18ae98 with SHA-1 36aa3f237c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006
Change-Id: I4933ce379eafa34222c8e22c6da535fb508e3428
2021-05-14 03:25:00 +00:00
Nucca Chen
76cc470496
Merge "bpf: Add interface index to BPF devmap" am: aa10ddfa6f am: 72bd34e343
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703125
Change-Id: I8ed82b1f5b8fa35e398c6d8c3bc928a03ee6318c
2021-05-14 03:01:16 +00:00
Junyu Lai
d1c8af2783
Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006
Change-Id: I436b4a50f672bf6ea84b41efc973135b41b20f5e
2021-05-14 03:01:10 +00:00
Junyu Lai
ab2a5cd02f
Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006
Change-Id: I5b925a63b8e7eb9b28170709d6f1213071552f57
2021-05-14 03:01:05 +00:00
Nucca Chen
72bd34e343
Merge "bpf: Add interface index to BPF devmap" am: aa10ddfa6f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703125
Change-Id: Ic4bcba98c1f1e43314a0a9797b427fee4bb0c20e
2021-05-14 02:46:15 +00:00
Junyu Lai
b8c3c59504
Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006
Change-Id: I97fba52572d7244106b3ee3770431939804dbc5a
2021-05-14 02:46:08 +00:00
Nucca Chen
aa10ddfa6f
Merge "bpf: Add interface index to BPF devmap"
2021-05-14 02:45:38 +00:00
Junyu Lai
4ec15d5d71
Merge "[SP32.3] No-op refactoring of OffloadControllerTest"
2021-05-14 02:18:12 +00:00
Mark Chien
ac86bc3751
Merge "Revert "Add ACCESS_NETWORK_STATE to Tethering CTS"" into sc-dev am: ec738f3e36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14456721
Change-Id: I7c4a39d3cdde0bfff3669981a7bb7167e5b7c270
2021-05-13 17:54:21 +00:00
TreeHugger Robot
97a8d7a35b
Merge "Fix MtsTetheringTest fail to access hidden tethering api problem" into sc-dev am: 4959976b6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14452543
Change-Id: Ie1c7c1c5ec79e4696872ad86a72e7387faed498d
2021-05-13 17:54:04 +00:00
Mark Chien
ec738f3e36
Merge "Revert "Add ACCESS_NETWORK_STATE to Tethering CTS"" into sc-dev
2021-05-13 17:45:31 +00:00
Mark Chien
0d18d18252
Revert "Add ACCESS_NETWORK_STATE to Tethering CTS"
...
This reverts commit 90255ef0a7 .
Reason for revert: this change break TetheringCoverageTests which test whether guard with proper permission (ACCESS_NETWORK_STATE). Instead of adding permission to test, use runAsShell with ACCESS_NETWORK_STATE: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1699426/1/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
Bug: 187371740
Change-Id: Id8f27dce237ab34c1a735ce4678e661a6113377e
2021-05-13 17:44:05 +00:00
TreeHugger Robot
4959976b6f
Merge "Fix MtsTetheringTest fail to access hidden tethering api problem" into sc-dev
2021-05-13 17:31:01 +00:00
Mark Chien
34915dc9b2
Merge "Fix some TetheringCoverageTest failure" am: 08b89743de am: bf74c05038 am: 11f7f5d4b7 am: e215c9d6a8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1699426
Change-Id: I830e8f68e523ac154a488ffd46abf4d5d1694790
2021-05-13 17:00:34 +00:00
Mark Chien
c1d4d76e85
Merge "Fix some TetheringCoverageTest failure" am: 08b89743de am: bf74c05038 am: 3d4f367a25 am: b88f9f0575
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1699426
Change-Id: I8a5c7e3f46a5f0b9f902003eb0d0c12639173f33
2021-05-13 17:00:18 +00:00
Mark Chien
e215c9d6a8
Merge "Fix some TetheringCoverageTest failure" am: 08b89743de am: bf74c05038 am: 11f7f5d4b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1699426
Change-Id: Ifbdf1e2b1a4f74fa4e8bbdad5de62cbd346efe0f
2021-05-13 16:54:44 +00:00
Mark Chien
b88f9f0575
Merge "Fix some TetheringCoverageTest failure" am: 08b89743de am: bf74c05038 am: 3d4f367a25
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1699426
Change-Id: Id89d14377c2df4055d7a701129449a68007d40f1
2021-05-13 16:45:01 +00:00
Mark Chien
11f7f5d4b7
Merge "Fix some TetheringCoverageTest failure" am: 08b89743de am: bf74c05038
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1699426
Change-Id: I7aa5207bbca37d5599ce678f67d466bf186abd8b
2021-05-13 16:24:04 +00:00
Mark Chien
3d4f367a25
Merge "Fix some TetheringCoverageTest failure" am: 08b89743de am: bf74c05038
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1699426
Change-Id: I8d522afdf7e1b9ec26fbd4f491f7b95e9ccfecc6
2021-05-13 16:22:01 +00:00
TreeHugger Robot
2aec83b46d
Merge changes from topic "sp31" into sc-dev am: 3345125c08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13981692
Change-Id: I57b66ee7a3e0a3a44a807253e78607c5737cef30
2021-05-13 16:05:37 +00:00
Mark Chien
bf74c05038
Merge "Fix some TetheringCoverageTest failure" am: 08b89743de
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1699426
Change-Id: Id3b14e197d1cd42a2a0dfa4c4c7cef2d052cbf9c
2021-05-13 16:00:40 +00:00
TreeHugger Robot
3345125c08
Merge changes from topic "sp31" into sc-dev
...
* changes:
[SP35] Pass data warning to tethering offload
[SP34] Adapt onSetWarningAndLimit
2021-05-13 15:52:59 +00:00
Mark Chien
08b89743de
Merge "Fix some TetheringCoverageTest failure"
2021-05-13 15:46:02 +00:00
Junyu Lai
9e6aba6bab
Merge "No-op Refactoring of startTrackDefaultNetwork" am: 7fecf6a017 am: 784f54eefb am: 2584246084 am: b355288839
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697371
Change-Id: I4d7e58fd625c232e4384da2b55afaf7919b163fc
2021-05-13 15:44:31 +00:00
Junyu Lai
065cf3a563
Merge "No-op Refactoring of startTrackDefaultNetwork" am: 7fecf6a017 am: 784f54eefb am: 80ccb96458 am: 5f32284acd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697371
Change-Id: I59ba188617111a51c62f8e1931363a1cdb99b4a2
2021-05-13 15:44:21 +00:00
markchien
ac3e0bb7fc
Fix MtsTetheringTest fail to access hidden tethering api problem
...
E.g. Accessing hidden method
Landroid/net/TetheringManager$TetheringInterfaceRegexps;
->getTetherableWifiRegexs()Ljava/util/List; (blacklist, linking, denied)
Bug: 183459282
Test: atest MtsTetheringTest on both R and S platform
Ignore-AOSP-First: change already in AOSP.
Change-Id: I3c5f08615fcf897fac59f2493be5337f78c2fdc7
2021-05-13 15:44:18 +00:00
Junyu Lai
b355288839
Merge "No-op Refactoring of startTrackDefaultNetwork" am: 7fecf6a017 am: 784f54eefb am: 2584246084
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697371
Change-Id: I189d3645845c462dfd7de3ae3190a50f5f726656
2021-05-13 15:31:29 +00:00
Junyu Lai
5f32284acd
Merge "No-op Refactoring of startTrackDefaultNetwork" am: 7fecf6a017 am: 784f54eefb am: 80ccb96458
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697371
Change-Id: If974c537e869caa6c0f9914b04bc6dc696c76b9c
2021-05-13 15:30:25 +00:00
Junyu Lai
80ccb96458
Merge "No-op Refactoring of startTrackDefaultNetwork" am: 7fecf6a017 am: 784f54eefb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697371
Change-Id: Ieda8a53749f35b5585488a1a6bd5e20b7891e75d
2021-05-13 15:06:56 +00:00
Junyu Lai
2584246084
Merge "No-op Refactoring of startTrackDefaultNetwork" am: 7fecf6a017 am: 784f54eefb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697371
Change-Id: I7089860fd3174e87d6ff9e6a4da85025f47d8aec
2021-05-13 15:06:54 +00:00
Junyu Lai
784f54eefb
Merge "No-op Refactoring of startTrackDefaultNetwork" am: 7fecf6a017
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697371
Change-Id: I3a03e19384ba021aa176f681e7b288f5bde59638
2021-05-13 14:51:34 +00:00
Junyu Lai
7fecf6a017
Merge "No-op Refactoring of startTrackDefaultNetwork"
2021-05-13 14:32:00 +00:00
junyulai
a36f33ef90
[SP35] Pass data warning to tethering offload
...
This is supported by:
1. Utilize the new API from both NetworkStatsProvider
and IOffloadControl to send data warning quota to hardware.
And pass the warning reached notification back to NPMS.
2. Disable software solution introduced in R release for
V1.1+ hardware, since now we can fully offload data warning
and limit notification to hardware.
Test: atest TetheringTests
Fix: 149467454
Ignore-AOSP-First: avoid long automerger delay
Change-Id: Ie49461694d77ab7f25a549433b01b5b0167bd489
2021-05-13 22:08:10 +08:00
junyulai
6d8da9f72d
[SP34] Adapt onSetWarningAndLimit
...
This is a no-op change that just adapt new API from
NetworkStatsProvider to get warning and limit bytes at the same
time. This change also stores them locally for subsequent
patches to set warning bytes to hardware.
Test: Will be included in the subsequent patch.
Bug: 149467454
Ignore-AOSP-First: avoid long automerger delay
Change-Id: Iec01cb01fd1ce481ce0bd736762baddde1e38084
2021-05-13 21:55:31 +08:00
TreeHugger Robot
30717a18ec
Merge "[SP33] Adapt ITetheringOffloadCallback V1.1" into sc-dev am: 0b4086c713
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13973147
Change-Id: Ia9bf582b2f6c46f4bc43c34d9af090ce502df265
2021-05-13 10:45:34 +00:00
TreeHugger Robot
0b4086c713
Merge "[SP33] Adapt ITetheringOffloadCallback V1.1" into sc-dev
2021-05-13 10:38:33 +00:00
Chiachang Wang
13b754c0e3
Merge "Add test for ConnectivityManager.setGlobalProxy()" am: 78c1663ba3 am: 650927c734 am: 5dc98a0880 am: 5199d09ecb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688272
Change-Id: I0a13680022ede1c9cc793e4d979f1a78e65f0a05
2021-05-13 10:37:45 +00:00
Chiachang Wang
760bc6a5ac
Merge "Add test for ConnectivityManager.setGlobalProxy()" am: 78c1663ba3 am: 650927c734 am: 3fea4fa064 am: 49c94c8500
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688272
Change-Id: Id4f3af68a6c56337198579955561fac7fcf619b6
2021-05-13 10:36:57 +00:00
Chiachang Wang
5199d09ecb
Merge "Add test for ConnectivityManager.setGlobalProxy()" am: 78c1663ba3 am: 650927c734 am: 5dc98a0880
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688272
Change-Id: I98d641ba50a231e59862a7bae039407d7bf70535
2021-05-13 10:25:00 +00:00
Chiachang Wang
49c94c8500
Merge "Add test for ConnectivityManager.setGlobalProxy()" am: 78c1663ba3 am: 650927c734 am: 3fea4fa064
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688272
Change-Id: I3a50a087f945bb951eb2eaff40838a0bea15e3b9
2021-05-13 10:23:57 +00:00
Chiachang Wang
3fea4fa064
Merge "Add test for ConnectivityManager.setGlobalProxy()" am: 78c1663ba3 am: 650927c734
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688272
Change-Id: Id68f9718dedfdc294bda304c99e1d84281497e2c
2021-05-13 10:07:37 +00:00
Chiachang Wang
5dc98a0880
Merge "Add test for ConnectivityManager.setGlobalProxy()" am: 78c1663ba3 am: 650927c734
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688272
Change-Id: I669ec8fe9be1b0f319df22e39a008dc298dfe66e
2021-05-13 10:07:33 +00:00
Chiachang Wang
650927c734
Merge "Add test for ConnectivityManager.setGlobalProxy()" am: 78c1663ba3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688272
Change-Id: Iaf40a7004a6305ad86b985695bfe4a9ee9038c96
2021-05-13 09:44:29 +00:00
Chiachang Wang
78c1663ba3
Merge "Add test for ConnectivityManager.setGlobalProxy()"
2021-05-13 09:30:25 +00:00
junyulai
5454e8978e
[SP33] Adapt ITetheringOffloadCallback V1.1
...
This is a no-op change that redirect both V1.0 and V1.1 callback
events to the same handling function. Since the V1.1 callback
is extended from V1.0 callback, we can safely use V1.1
callback for both V1.0 and V1.1 control.
The change also provides interface for subsequent
OffloadController changes to set warning and limit at the
same time.
Test: atest TetheringTests
Bug: 149467454
Ignore-AOSP-First: avoid long automerger delay
Change-Id: I6505a04de8c57357dd1fa9ce898c13395e497816
2021-05-13 16:45:40 +08:00