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
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
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
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
0b4086c713
Merge "[SP33] Adapt ITetheringOffloadCallback V1.1" into sc-dev
2021-05-13 10:38:33 +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
junyulai
b95083ea6a
No-op Refactoring of startTrackDefaultNetwork
...
While the actual part that track default request is inside
UpstreamNetworkMonitor, instead of passing it from Tethering,
move it into counter-part CL and use it from
UpstreamNetworkMonitor.
Since the current code is replaced by registerSystemDefaultCallback
in Android S, implement it inside the api30 shim implementation
to provide an unified interface to tethering.
Test: atest TetheringCoverageTests
Bug: 185952829
Change-Id: Iaf21b6b662aa6aba79c2b75379128b8523f81f02
2021-05-13 14:07:40 +08:00
Lucas Lin
cbabb00407
[automerger skipped] Merge "Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally" am: d56f4a700b am: 71d233730c am: 2732048e77 -s ours
...
am skip reason: Merged-In Iafcd861714d8aca44cede658ed630f9d5afd5e59 with SHA-1 75ba4e7873 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1696705
Change-Id: I54a257134e9830cd3809a59f5993cef1118f2e7e
2021-05-12 18:24:14 +00:00
Lucas Lin
01613adbe4
[automerger skipped] Merge "Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally" am: d56f4a700b am: 71d233730c am: 97d4f16867 -s ours
...
am skip reason: Merged-In Iafcd861714d8aca44cede658ed630f9d5afd5e59 with SHA-1 75ba4e7873 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1696705
Change-Id: I9df59f2c0f1604ae72020d47b12f62dd91038b63
2021-05-12 18:22:29 +00:00
Lucas Lin
2732048e77
Merge "Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally" am: d56f4a700b am: 71d233730c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1696705
Change-Id: Id6b542ca141ee2b06a6b082277fda333bd0bf8cf
2021-05-12 17:59:57 +00:00
Lucas Lin
97d4f16867
Merge "Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally" am: d56f4a700b am: 71d233730c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1696705
Change-Id: Ifaea1630983078ee810f1d495d0d63fe9acd9d1b
2021-05-12 17:59:30 +00:00
Lucas Lin
71d233730c
Merge "Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally" am: d56f4a700b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1696705
Change-Id: I05089bdc7433ec244fe9be8cbc4e9afd40da0f27
2021-05-12 17:23:46 +00:00
Lucas Lin
d56f4a700b
Merge "Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally"
2021-05-12 17:09:50 +00:00
markchien
075432d7c9
Fix some TetheringCoverageTest failure
...
1. Fix no ACCESS_NETWORK_STATE permission problem when accessing
EthernetManager#getAvailableInterfaces API from S.
2. Fix some wrong jarjar rules.
Bug: 187371740
Test: atest TetheringCoverageTest on R platform
Change-Id: I203db6c4ea2e13d8fb5bc2db7ee877ccbb97b761
2021-05-12 14:12:10 +00:00
Lorenzo Colitti
b8537b5677
Remove dead code. am: 2422319cb7 am: 9d288a6904 am: 38bf66f05d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703126
Change-Id: I4741ac6eb7209821c1332ebd59ecfff09003b8c1
2021-05-12 11:29:12 +00:00
Lorenzo Colitti
c8984068bf
Remove mPublicSync. am: 94311aa902 am: c0f1bed8c5 am: b541f5fdfd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678387
Change-Id: Ice8198cb8e12a0db3e912545bc6772125c29b7c1
2021-05-12 11:29:10 +00:00
Lorenzo Colitti
2fde23a84e
Make Tethering#dump asynchronous. am: 5f729e14a3 am: c7a163bae8 am: 2bea99a840
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678386
Change-Id: I5d151bf57c814258aad86c383d4fcceb3a8ca81a
2021-05-12 11:29:09 +00:00
Lorenzo Colitti
4e3af62dd8
Skip presubmit for IPsec transport mode IPv6 TCP tests. am: b54bdabe5a am: 946da7b575 am: 7c9c64a663
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705126
Change-Id: Ia3aa14f30887f5b774ffacce6882a1e013e48f3d
2021-05-12 11:29:07 +00:00
Lorenzo Colitti
1284d846b0
Remove dead code. am: 2422319cb7 am: 9d288a6904 am: e91257ecf4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703126
Change-Id: If37743e00b8ef51f22fb167981e9a61f0349c05d
2021-05-12 11:22:30 +00:00
Lorenzo Colitti
8b381c19fc
Remove mPublicSync. am: 94311aa902 am: c0f1bed8c5 am: 1a56f34c7c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678387
Change-Id: Ie0ca3c2c7e38cb3c3823b975f565749e99cd8af5
2021-05-12 11:22:28 +00:00
Lorenzo Colitti
6cb74cf519
Make Tethering#dump asynchronous. am: 5f729e14a3 am: c7a163bae8 am: 778d795271
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678386
Change-Id: Ideb8059f0a47da50be761c9484e18622a02f01c9
2021-05-12 11:22:27 +00:00
Lorenzo Colitti
33f4ae3722
Skip presubmit for IPsec transport mode IPv6 TCP tests. am: b54bdabe5a am: 946da7b575 am: 7e41d51fa4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705126
Change-Id: I5a39cf5337bf83ab2266921664b34332cfa1666d
2021-05-12 11:22:25 +00:00
Lorenzo Colitti
38bf66f05d
Remove dead code. am: 2422319cb7 am: 9d288a6904
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703126
Change-Id: I3913a868982465f304ea5f48da538096dd900641
2021-05-12 10:55:46 +00:00
Lorenzo Colitti
e91257ecf4
Remove dead code. am: 2422319cb7 am: 9d288a6904
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703126
Change-Id: Ib82c7542b1fdf6d46182694a8b24147b3d7a3b25
2021-05-12 10:55:44 +00:00
Lorenzo Colitti
b541f5fdfd
Remove mPublicSync. am: 94311aa902 am: c0f1bed8c5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678387
Change-Id: I8bc28ee7ed0a658e7218a00c82cb038a58c15d00
2021-05-12 10:55:44 +00:00
Lorenzo Colitti
1a56f34c7c
Remove mPublicSync. am: 94311aa902 am: c0f1bed8c5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678387
Change-Id: Ie173e954e3ed27aebb73ebe2baefe3eff1c52556
2021-05-12 10:55:44 +00:00
Lorenzo Colitti
2bea99a840
Make Tethering#dump asynchronous. am: 5f729e14a3 am: c7a163bae8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678386
Change-Id: I000322644add81eb1bc366cf71e7cd308bcda555
2021-05-12 10:55:43 +00:00
Lorenzo Colitti
778d795271
Make Tethering#dump asynchronous. am: 5f729e14a3 am: c7a163bae8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678386
Change-Id: Iab29a982cdc237140820f15edc3fe80acaca5683
2021-05-12 10:55:42 +00:00
Lorenzo Colitti
7c9c64a663
Skip presubmit for IPsec transport mode IPv6 TCP tests. am: b54bdabe5a am: 946da7b575
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705126
Change-Id: I8d18d775806afdffbf08c2419c2f120ae806ad4d
2021-05-12 10:55:41 +00:00