Commit Graph

216 Commits

Author SHA1 Message Date
Nucca Chen
03f328a76b Merge changes I2d6f80f0,I9c26852d am: 50522024a1 am: 6151bb7aed am: 2cc2f3b424 am: bfa2706282 am: 8756467fb7
Change-Id: I5899298597fd2fce44c4093338ad19df51b15eb1
2020-05-12 12:17:41 +00:00
Nucca Chen
2cc2f3b424 Merge changes I2d6f80f0,I9c26852d am: 50522024a1 am: 6151bb7aed
Change-Id: I52c3ba5b46dc6e52307f68c9201fc19b0a368a09
2020-05-12 11:34:28 +00:00
Nucca Chen
50522024a1 Merge changes I2d6f80f0,I9c26852d
* changes:
  Use device option to control BPF offload features
  Add tether BPF offload config to device config and resource
2020-05-12 11:00:04 +00:00
Mark Chien
2022ffdcfb Merge "Allow to exempt from entitlement check" am: 469314ecc8 am: ec7cf5e356 am: fa0384ea72 am: 27b296db53 am: 48ecdd0891
Change-Id: I747dc832886ba5daf4b0657bac424370f8f89780
2020-05-08 13:23:37 +00:00
Mark Chien
fa0384ea72 Merge "Allow to exempt from entitlement check" am: 469314ecc8 am: ec7cf5e356
Change-Id: I34a405492bd2e80aa731e5ac5d56034f7a80cd45
2020-05-08 12:47:48 +00:00
Mark Chien
cb74eedb1c Merge "Address the comment of aosp/1288493" am: 974d6f5978 am: b51ef98b86 am: 250a10eec4 am: 4fa682fe4e am: 80fa790913
Change-Id: I3cb7b968362ebc7d629a617165683dcc17add228
2020-05-08 11:55:16 +00:00
Mark Chien
250a10eec4 Merge "Address the comment of aosp/1288493" am: 974d6f5978 am: b51ef98b86
Change-Id: Idfe4cbf12cbcc233c1061b26e962dcf21cd36de0
2020-05-08 11:00:42 +00:00
markchien
f5078f489d Allow to exempt from entitlement check
To exempt from entitlement check, caller need to hold TETHER_PRIVILEGED
permission.

Bug: 141256482
Test: atest TetheringTests

Change-Id: I2eb37f5e92f5f5150a7fb7c25b945e28704d27a0
2020-05-08 18:55:26 +08:00
markchien
147e5765ee Address the comment of aosp/1288493
Bug: 141256482
Test: atest TetheringTests
Change-Id: I0cf337625cee31a47879c59e9b18657ea7624eb4
2020-05-08 15:51:52 +08:00
Automerger Merge Worker
6ab2919b02 Merge "Merge "Test tethering log dump" am: 0e3371469e am: 3369043fca" into rvc-dev-plus-aosp am: 3245c39745 am: 13ba213ed0 am: 7a9132ffce
Change-Id: I0f402dd1be39f3ed40f2802b0d167358bb08a898
2020-05-07 04:49:14 +00:00
Mark Chien
80aa028b9c Merge "Test tethering log dump" am: 0e3371469e am: 3369043fca
Change-Id: I20e8808afefaf0d5964871db976e288191a75ad7
2020-05-07 03:49:42 +00:00
markchien
146f6055bd Test tethering log dump
Bug: 145490751
Test: atest TetheringTests
Change-Id: I01fc6969041711f7a15880144ee5eac591086ecd
2020-05-06 17:00:37 +08:00
Junyu Lai
17993ce726 Merge "[SP18.6] Make offload controller poll interval configurable" am: 10c8c21777 am: 6848610485 am: 941fc9ecab am: 4df6240075 am: 413b7b3f12
Change-Id: I898ffdb3335317e528636c91eede234a909ad9a4
2020-05-05 11:32:18 +00:00
Junyu Lai
941fc9ecab Merge "[SP18.6] Make offload controller poll interval configurable" am: 10c8c21777 am: 6848610485
Change-Id: Iab4a5f883a8357c23375633c16059b38d74b9e9b
2020-05-05 10:45:38 +00:00
Hungming Chen
3d8fa889b4 Use device option to control BPF offload features
If BPF offload device config is not enabled:
- Does not add/remove offload forwarding rules through disabling IP
  neighbor monitor.
- Does not apply the RA MTU reduction.

Bug: 149997301
Test: atest IpServerTest
Change-Id: I2d6f80f0229f580c4b16243a064e889a6c37f77a
2020-05-05 17:43:50 +08:00
Hungming Chen
8bf2e7e05b Add tether BPF offload config to device config and resource
The tether bpf offload can be enabled by resource config and
device config. The device config has higher priority and it
could override this config which is set by resource config.

Bug: 149997301
Test: -build, flash, boot
      -atest TetheringConfigurationTest
Change-Id: I9c26852d2c926786e141ece6da53df3801c049b2
2020-05-05 17:37:32 +08:00
Junyu Lai
5ce2a2a7ba Merge changes from topic "sp18-TestableNetworkStatsProviderCbBinder" am: 80ab95927b am: c44a1ba581 am: f8cd65936d am: 6e1ffdc503 am: f3ba538ef6
Change-Id: I7b4b14cf89fcdb8881ed20f17cdddbdd39d4eca0
2020-05-05 04:10:53 +00:00
Junyu Lai
f8cd65936d Merge changes from topic "sp18-TestableNetworkStatsProviderCbBinder" am: 80ab95927b am: c44a1ba581
Change-Id: Iceb250d8ba0d31a39538dd59e687ea2d80f4aaba
2020-05-05 03:50:52 +00:00
junyulai
5475504266 [SP18.6] Make offload controller poll interval configurable
Test: atest TetheringTests
Bug: 149467454

Change-Id: I0b07a0b520dedb479bf863fbfe898ae85b84b0f3
2020-05-05 11:45:36 +08:00
junyulai
9606a22037 [SP18.5] Create offload controller poll interval to resource
Test: atest TetheringConfigurationTest
Bug: 149467454
Change-Id: I8b4ad920a4945504914d3741a9fba5c096fbf452
2020-05-04 14:56:37 +08:00
junyulai
9c50628e95 [SP18.4] Add unit test for polling network stats in OffloadController
Test: atest OffloadControllerTest
Bug: 149467454
Change-Id: I9b9c9c096a2366aaf383d5c2d567db6682f02dad
2020-05-04 14:56:37 +08:00
junyulai
da5dfd9f0d [SP18.3] Adapt TestableNetworkStatsProviderCbBinder
This is a no-op refactoring to adapt new test provider callback.
Also this patch adapts TestLooper to allow better control on
delay messages that will be verified in subsequent tests.

Test: atest OffloadControllerTest
Bug: 149467454
Change-Id: Icfd6ff289d6689ae2d5753d3fe472516c808dc7a
2020-05-04 14:56:36 +08:00
Treehugger Robot
29aee20bfa Merge "[SP18.1] add dependency object to OffloadController" am: c75f373448 am: 30af8e6201 am: 912b722290 am: b316d05e25 am: e66cec5be6
Change-Id: I83a01126b6bccb7ec88ba25922deecac45ccc93a
2020-04-29 13:28:12 +00:00
Treehugger Robot
912b722290 Merge "[SP18.1] add dependency object to OffloadController" am: c75f373448 am: 30af8e6201
Change-Id: Ic1586dee9e62a3a1484feec91cc66883a12bb90b
2020-04-29 12:45:13 +00:00
Treehugger Robot
c75f373448 Merge "[SP18.1] add dependency object to OffloadController" 2020-04-29 12:08:22 +00:00
junyulai
360c88f238 [SP18.1] add dependency object to OffloadController
In order to mock constant in unit test, a dependency object is
introduced with minimum code change to achieve this.

Test: atest TetheringTests
Bug: 149467454
Change-Id: I38628daddcb7be7c74846e78d36dc88f065b97d9
2020-04-28 18:27:57 +08:00
Mark Chien
14442119cb Merge "Remove Preconditions usage to stop dependecy with non-updatble class" am: 821089e106 am: cdee1cfe24 am: db6cf82c14 am: 04204628d2 am: be9de9a6e4
Change-Id: Ia45990f71f0f85b1d345e0e2f3ff4c2bb229434a
2020-04-27 11:43:00 +00:00
Mark Chien
db6cf82c14 Merge "Remove Preconditions usage to stop dependecy with non-updatble class" am: 821089e106 am: cdee1cfe24
Change-Id: I856a936b295426bb2ba219eb4e510f6a2a3ac12b
2020-04-27 11:17:28 +00:00
Mark Chien
821089e106 Merge "Remove Preconditions usage to stop dependecy with non-updatble class" 2020-04-27 10:54:19 +00:00
Remi NGUYEN VAN
79c6f5185f Merge "Address comments on NetworkStack AIDL v6" am: 9b687b94a4 am: fb8a431cc5 am: 6be926b580 am: a3c0247a3b am: 48ce8dcf8c
Change-Id: Ida22c941d7570e966c0b51b4561f1ed229243757
2020-04-24 12:55:39 +00:00
Remi NGUYEN VAN
6be926b580 Merge "Address comments on NetworkStack AIDL v6" am: 9b687b94a4 am: fb8a431cc5
Change-Id: Id385210ccd8d08bc2d15e964bbca25c452a3cde8
2020-04-24 12:19:37 +00:00
Remi NGUYEN VAN
9b687b94a4 Merge "Address comments on NetworkStack AIDL v6" 2020-04-24 11:56:32 +00:00
Remi NGUYEN VAN
aba3d2ebeb Address comments on NetworkStack AIDL v6
Address issues found during AIDL review:
 - Rename clientAddr to singleClientAddr
 - Do not use a ParcelableBundle for notifyNetworkTested or
   notifyDataStallSuspected; instead use AIDL parcelables for stronger
   backwards compatibility guarantees.

Test: atest NetworkMonitorTest ConnectivityServiceTest
      ConnectivityServiceIntegrationTest, manual
Bug: 153500847
Change-Id: Id9b71784e5f6294d203230e57737979e063ff0f8
2020-04-24 18:52:02 +09:00
markchien
b9c19778f4 Remove Preconditions usage to stop dependecy with non-updatble class
Stop depending on Preconditions that is not released on the same cadence
as the module, and is maintained as part of the framework.

Bug: 148636687
Test: atest TetheringTests NetworkStackNextTests

Change-Id: Id0dcec44f362f79bc8c046d722635687a7388aa2
2020-04-24 00:47:56 +08:00
Paul Hu
2eb66bdbe4 Merge "[TNU09] Adjust restricted notification" am: 3db6cae8d4 am: 19575361f2 am: be2d888a81 am: c06ff3a33f am: 3f4766be45
Change-Id: Id6f39fe7f12260d40c5629073d2dadab15b922f6
2020-04-23 09:07:00 +00:00
Paul Hu
be2d888a81 Merge "[TNU09] Adjust restricted notification" am: 3db6cae8d4 am: 19575361f2
Change-Id: I4488ed76a4c9859d6d947953d132e63c0366810e
2020-04-23 08:28:53 +00:00
Paul Hu
3db6cae8d4 Merge "[TNU09] Adjust restricted notification" 2020-04-23 07:50:34 +00:00
Paul Hu
fa882fdb96 Merge "Add TetheredClient tests" am: dd481a1dee am: eff436b223 am: 099acab36e am: e3ec7aa64c am: d01b917c15
Change-Id: I80e01f8eda4941e7b0de49d9a767e4cd264ba1f7
2020-04-22 16:50:48 +00:00
paulhu
03142a0568 [TNU09] Adjust restricted notification
1. Let restricted notification that can be dismissed.
2. Only put up restricted notification when any of tethering is
   activating.

Bug: 154214549
Test: atest TetheringTests
Change-Id: Ib980aca154036828abdab35e3bb11d42f85ff610
2020-04-23 00:17:28 +08:00
Paul Hu
099acab36e Merge "Add TetheredClient tests" am: dd481a1dee am: eff436b223
Change-Id: I094a4f8dcf7b5b1392065166c01113ce0fb97b9d
2020-04-22 16:07:42 +00:00
Paul Hu
dd481a1dee Merge "Add TetheredClient tests" 2020-04-22 15:22:32 +00:00
Philip P. Moltmann
8d5c1d7efb Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: 83ba9531d7 am: 319db1af8b
Change-Id: I099944752fc3006c1e98750dd46dbebf5e50789f
2020-04-22 15:19:14 +00:00
Philip P. Moltmann
83ba9531d7 Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" 2020-04-22 14:58:13 +00:00
Philip P. Moltmann
f4c703461d Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" 2020-04-22 14:57:49 +00:00
Paul Hu
f340f6fd46 Merge "Add TetheringCommonTests" am: 7219f9a5dd am: 075cf4d923 am: 0d6c6444e8 am: 1962d2d102 am: d0c619609e
Change-Id: I45ae4551efa1e9f8df040d458aba83282a3e0cfa
2020-04-22 14:01:56 +00:00
Paul Hu
0d6c6444e8 Merge "Add TetheringCommonTests" am: 7219f9a5dd am: 075cf4d923
Change-Id: I0d10c0c02375b10cbd2cd30e2fbe473580118b6c
2020-04-22 13:17:57 +00:00
paulhu
8981563137 Add TetheredClient tests
Test APIs below:
getAddresses()
getMacAddress()
getTetheringType()
AddressInfo.getAddress()
AddressInfo.getHostname()
AddressInfo.writeToParcel(android.os.Parcel, int)

Bug: 153614365
Bug: 153613717
Test: atest TetheringTests
Change-Id: Ic7cbebe54a38af5b5c4639eb7641a20de6864a26
2020-04-22 16:32:58 +08:00
paulhu
7e514020b5 Add TetheringCommonTests
Bug: 153614365
Bug: 153613717
Test: atest TetheringTests TetheringCoverageTests
Change-Id: If7c933ec0c72943312cd37bfc66918f10a5504a9
2020-04-22 16:15:33 +08:00
Paul Hu
ed2432f4b1 Merge "[TNU08] Remove the "tethering is on" notification" am: 3680357420 am: 6296583f61 am: 2026b5addb am: 9f7b74cf09 am: 15cb89d750
Change-Id: Ied056ed80f8dc6caa72a489a2c75eab40b646dbe
2020-04-22 06:37:51 +00:00
Paul Hu
2026b5addb Merge "[TNU08] Remove the "tethering is on" notification" am: 3680357420 am: 6296583f61
Change-Id: Ie49b39eaf0170ecb74043dfba2cdc5b115a1477d
2020-04-22 06:05:12 +00:00