Commit Graph

8895 Commits

Author SHA1 Message Date
Mark Chien
c3582b3e7b Merge "TetheringManager API clean up" into rvc-dev am: 3da1e71044
Change-Id: Id093ec8add4777f1d4a2c3d0890378acdc7ceaed
2020-03-19 12:07:18 +00:00
Mark Chien
3da1e71044 Merge "TetheringManager API clean up" into rvc-dev 2020-03-19 12:04:05 +00:00
Lorenzo Colitti
fd27e89164 Merge "Make Ethernet interfaces more testable." am: a2f1af1e17 am: 5ddf168050
Change-Id: I5a73dc5ad6576573bcac6c7ac6f1270dfbb97470
2020-03-19 11:46:55 +00:00
Lorenzo Colitti
5ddf168050 Merge "Make Ethernet interfaces more testable." am: a2f1af1e17
Change-Id: I456acb05d548b3d0281e500cfd91d888441d7f94
2020-03-19 11:30:33 +00:00
Lorenzo Colitti
a2f1af1e17 Merge "Make Ethernet interfaces more testable." 2020-03-19 11:12:09 +00:00
Paul Hu
d88cca52db [automerger skipped] Merge "Kill ConnectivityManager.CONNECTIVITY_ACTION_SUPL" into rvc-dev am: b1b08a0d45 -s ours
am skip reason: Change-Id Ie9e5127742beba04f1c191e894e8a29fe1e704bb with SHA-1 d9ce33f980 is in history

Change-Id: Ic800ee63613d55ddd604c29057a9ea138e27c0de
2020-03-19 10:20:26 +00:00
Junyu Lai
36f6e4300f [automerger skipped] Merge changes I7eaca623,Ic94da540,If330e853,Ie2d229be,Ic6b2f10f am: b3c511d028 am: 124a03a96f -s ours
am skip reason: Change-Id I7eaca623adf93f9b8d53c2e5857ecae90ea572ab with SHA-1 e36b07b902 is in history

Change-Id: Id0224efe75304500cbbb83a551727aa3b09c47f7
2020-03-19 09:40:03 +00:00
junyulai
ad104f711c [automerger skipped] [SM07] Make combine subtype configurable from Settings am: 4e63e42a57 am: 53651df7f8 -s ours
am skip reason: Change-Id Ic94da540afa479ed18f1b6fbda4ae3216c37476b with SHA-1 8c526ea1bf is in history

Change-Id: Ife89c4526d5e5f79c09fce585b2f124ea06ff28a
2020-03-19 09:40:00 +00:00
junyulai
6d655984a1 [automerger skipped] [SM05] Enable record mobile network stats by collapsed rat type am: a04a1ed597 am: 6f5673043a -s ours
am skip reason: Change-Id If330e85330a4ff713dd420c98d42fa741eabd90a with SHA-1 6d3c4ef6ee is in history

Change-Id: I5f7e58d16e30eae69c45a505ea2ee9e4a9802d91
2020-03-19 09:39:55 +00:00
Junyu Lai
124a03a96f Merge changes I7eaca623,Ic94da540,If330e853,Ie2d229be,Ic6b2f10f am: b3c511d028
Change-Id: I091c93ba6b0001253e2b0679eee48293b4e51afc
2020-03-19 09:31:08 +00:00
junyulai
53651df7f8 [SM07] Make combine subtype configurable from Settings am: 4e63e42a57
Change-Id: I0c3f4a02f16eb6a4d9e48fa775bf456707d2b1bb
2020-03-19 09:31:02 +00:00
junyulai
6f5673043a [SM05] Enable record mobile network stats by collapsed rat type am: a04a1ed597
Change-Id: If4bcfaefd2244be67449066ef54a6bdc0c00eb86
2020-03-19 09:31:00 +00:00
markchien
68b6784942 TetheringManager API clean up
Per API review:
- @IntDef defined on the type integer parameter
- have getters on each parameter that is set in the
  TetheringRequest.Builder
- new added API should not be deprecated
Below APIs is moved from system-current to module-lib-current that only
plafrom code(e.g. ConnectivityManager and Settings) can use them.
TetheringRequest.
onTetherableInterfaceRegexpsChanged, TetheringInterfaceRegexps:
Only platform code can use them because interfaces by regular
expressions are a mechanism which is planning to be deprecated.

Also rename some constants for easier to understand.

Bug: 149858697
Bug: 151243337
Test: m doc-comment-check-docs
      atest TetheringTests
Change-Id: Idd041f0fbeca411ea23e49786a50dd7feb77ef45
2020-03-19 16:32:37 +08:00
Automerger Merge Worker
b5255d439e Kill ConnectivityManager.CONNECTIVITY_ACTION_SUPL
CONNECTIVITY_ACTION_SUPL is marked as a "temporary hack" and has
never been public. Remove this intent definition since no one is
receiving this intent and should use network callback to know the
connection change.

Bug: 109636544
Test: atest FrameworksNetTests
Change-Id: Ie9e5127742beba04f1c191e894e8a29fe1e704bb
Merged-In: Ie9e5127742beba04f1c191e894e8a29fe1e704bb
(cherry picked from aosp/1224697)
2020-03-19 06:53:04 +00:00
Junyu Lai
7271067aaf Merge changes I7eaca623,Ic94da540,If330e853,Ie2d229be,Ic6b2f10f into rvc-dev am: 7d06b09387
Change-Id: Ic8899a08eb93c8bafbe1bbc1201c2171534fdfb2
2020-03-19 06:38:05 +00:00
junyulai
0355c834d7 [SM07] Make combine subtype configurable from Settings am: 8c526ea1bf
Change-Id: Ic8426ae36b5aaadfdd3292a3b70fc9b290443d5c
2020-03-19 06:37:59 +00:00
junyulai
1b1caafa14 [SM05] Enable record mobile network stats by collapsed rat type am: 6d3c4ef6ee
Change-Id: I492dd32dc6b6af061da02a450c8c6abff0e8bf5e
2020-03-19 06:37:56 +00:00
Junyu Lai
7d06b09387 Merge changes I7eaca623,Ic94da540,If330e853,Ie2d229be,Ic6b2f10f into rvc-dev
* changes:
  [SM08] Add NetworkTemplate unit test for fetching mobile data usage
  [SM07] Make combine subtype configurable from Settings
  [SM05] Enable record mobile network stats by collapsed rat type
  [SM04] Support fetching data with NetworkTemplate with subType
  [SM02] Support record mobile network stats by collapsed rat type
2020-03-19 06:29:38 +00:00
Lucas Lin
475298d47e [automerger skipped] Merge "Add version check to prevent test fail on Android Q" into rvc-dev am: f425a3103a -s ours
am skip reason: Change-Id I73ef7eececec757a6e9683b231bf73fcd8d49f8d with SHA-1 f5ef6765d5 is in history

Change-Id: I44e001c8f140d121ede32bc581792cb8de66b54c
2020-03-19 03:16:57 +00:00
Lucas Lin
f425a3103a Merge "Add version check to prevent test fail on Android Q" into rvc-dev 2020-03-19 03:09:46 +00:00
junyulai
29b2aa1375 [SM08] Add NetworkTemplate unit test for fetching mobile data usage
Test: atest NetworkTemplateTest
Bug: 129082217

Change-Id: I7eaca623adf93f9b8d53c2e5857ecae90ea572ab
Merged-In: I7eaca623adf93f9b8d53c2e5857ecae90ea572ab
(cherry picked from commit d63ba64c52)
2020-03-19 10:10:07 +08:00
junyulai
4e63e42a57 [SM07] Make combine subtype configurable from Settings
Note that enabling/disabling would not take effect until device
reboot. This will be addressed in follow-up patch.

Test: 1. atest NetworkStatsServieTest SettingsBackupTest
      2. adb shell settings put global netstats_combine_subtype_enabled 1|0
Bug: 146415925

Change-Id: Ic94da540afa479ed18f1b6fbda4ae3216c37476b
Merged-In: Ic94da540afa479ed18f1b6fbda4ae3216c37476b
(cherry picked from commit 8e0fc53cfe and
 fix merge conflict in SettingsBackupTest)
2020-03-19 10:10:07 +08:00
junyulai
a04a1ed597 [SM05] Enable record mobile network stats by collapsed rat type
Switch on the recording in device side. Metrics will be
collected in follow-up patches which can be independently
enabled/disabled.

This change also fix the fail in NetworkStatsCollectionTest
which caused by enabling this feature, where the rounding
problem happened when records are distributed into smaller
buckets and categorized into more NetworkIdentity.

Test: atest FrameworksNetTests
Bug: 129082217
Change-Id: If330e85330a4ff713dd420c98d42fa741eabd90a
Merged-In: If330e85330a4ff713dd420c98d42fa741eabd90a
(cherry picked from commit a7117e41a2)
2020-03-19 10:10:07 +08:00
Paul Hu
18f3326b4b Merge "Kill ConnectivityManager.CONNECTIVITY_ACTION_SUPL" am: 8afd953975 am: 5401b69c64
Change-Id: Icfbcfdcfc5070bf0b4a2c0ead9e5eff1de1d1877
2020-03-19 01:45:18 +00:00
junyulai
e36b07b902 [SM08] Add NetworkTemplate unit test for fetching mobile data usage
Test: atest NetworkTemplateTest
Bug: 129082217

Change-Id: I7eaca623adf93f9b8d53c2e5857ecae90ea572ab
Merged-In: I7eaca623adf93f9b8d53c2e5857ecae90ea572ab
(cherry picked from commit 4670baace6c8dafe3a30330596c333d6b2389e4d)
2020-03-19 01:41:53 +00:00
junyulai
8c526ea1bf [SM07] Make combine subtype configurable from Settings
Note that enabling/disabling would not take effect until device
reboot. This will be addressed in follow-up patch.

Test: 1. atest NetworkStatsServieTest SettingsBackupTest
      2. adb shell settings put global netstats_combine_subtype_enabled 1|0
Bug: 146415925

Change-Id: Ic94da540afa479ed18f1b6fbda4ae3216c37476b
Merged-In: Ic94da540afa479ed18f1b6fbda4ae3216c37476b
(cherry picked from commit c4f77ac90bf2e48a655ad19b162fe74a23bf3fb0)
2020-03-19 01:40:55 +00:00
Remi NGUYEN VAN
986afbb328 [automerger skipped] Merge "Move sensitive field parceling bool to constructor" into rvc-dev am: 9718cbefcf -s ours
am skip reason: Change-Id Ib145ca7f36dcbee6ef47d09862a181fc04a28f03 with SHA-1 c38954692a is in history

Change-Id: I4d00f9a53ab0b129e3d9380f3381a29800cd2508
2020-03-19 01:37:27 +00:00
Remi NGUYEN VAN
0f051a85d9 [automerger skipped] Merge "Make LinkPropertiesTest backwards compatible" into rvc-dev am: 7b1c3b760f -s ours
am skip reason: Change-Id I570efa4eb483a717d4204a18473d02653a69f46d with SHA-1 1d88c2e1a1 is in history

Change-Id: I652b0744dcd2fff34609999fff062827efe5706e
2020-03-19 01:37:06 +00:00
Remi NGUYEN VAN
9718cbefcf Merge "Move sensitive field parceling bool to constructor" into rvc-dev 2020-03-19 01:32:48 +00:00
Remi NGUYEN VAN
7b1c3b760f Merge "Make LinkPropertiesTest backwards compatible" into rvc-dev 2020-03-19 01:32:17 +00:00
Paul Hu
5401b69c64 Merge "Kill ConnectivityManager.CONNECTIVITY_ACTION_SUPL" am: 8afd953975
Change-Id: I823ae84ac6f522400297d174ebfad5e61d4a6cd9
2020-03-19 01:30:58 +00:00
Remi NGUYEN VAN
c83000d3c2 Merge changes from topic "netstack_api_review" into rvc-dev am: 799e84ed01
Change-Id: Iddd40677121e331eb50b74aa379dabaf4632219d
2020-03-19 01:30:57 +00:00
Remi NGUYEN VAN
799e84ed01 Merge changes from topic "netstack_api_review" into rvc-dev
* changes:
  Remove usage of Context.NETWORK_STACK_SERVICE
  Remove NETWORK_STACK_SERVICE constant
2020-03-19 01:21:29 +00:00
Paul Hu
8afd953975 Merge "Kill ConnectivityManager.CONNECTIVITY_ACTION_SUPL" 2020-03-19 01:10:55 +00:00
Lorenzo Colitti
37438e77ee [automerger skipped] Merge "mtu: Add MTU parameter to Routes" into rvc-dev am: 27247d1f5d -s ours
am skip reason: Change-Id Ie339d0cee5be12c2232a4631fed61219a0facc64 with SHA-1 a8978d4b83 is in history

Change-Id: Ief18dc8bd69da468a2c633f32dab5ac16309e482
2020-03-19 00:57:07 +00:00
Lorenzo Colitti
27247d1f5d Merge "mtu: Add MTU parameter to Routes" into rvc-dev 2020-03-19 00:50:57 +00:00
Lorenzo Colitti
4c17972cb2 Make Ethernet interfaces more testable.
This CL adds a setIncludeTestInterfaces method to EthernetManager
that, when called, causes the Ethernet service to recognize and
manage test interfaces created by TestNetworkManager.

Bug: 150644681
Test: Tested by EthernetTetheringTest in same topic
Change-Id: I86eef7a93267f800dbfc8eafd307effa76a344ca
2020-03-19 09:46:37 +09:00
Cody Kesting
63d73e70be Merge "Restrict VPN Diagnostics callbacks to underlying networks." am: 034480fb36 am: 0d3efcb097
Change-Id: Iae4aa40b2232171f241d99a81ec84cbbac1fd64d
2020-03-18 20:26:46 +00:00
Cody Kesting
0d3efcb097 Merge "Restrict VPN Diagnostics callbacks to underlying networks." am: 034480fb36
Change-Id: Ia163abffdacf74218f37db9c67372867c6fe1143
2020-03-18 20:14:44 +00:00
Cody Kesting
034480fb36 Merge "Restrict VPN Diagnostics callbacks to underlying networks." 2020-03-18 20:07:52 +00:00
Cody Kesting
75ee711747 Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev am: cb9847691f
Change-Id: I7bb08844a95fcae66f84a2756b6a06184c74733e
2020-03-18 19:57:19 +00:00
Cody Kesting
a5195fd1cb Change NetworkCapabilities administrator UIDs to be stored as int[]. am: 1043927267
Change-Id: I26343fa85d936aa71dbe983341343fd1d74a7a0a
2020-03-18 19:56:33 +00:00
Cody Kesting
cb9847691f Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev 2020-03-18 19:40:39 +00:00
Cody Kesting
1043927267 Change NetworkCapabilities administrator UIDs to be stored as int[].
NetworkCapabilities#mAdministratorUids is used to track the UIDs that
are administrators of the given Network. This value was previously
stored as List<Integer>. However, general Android API Council guidelines
recommend using Arrays for primitive values. In order to be consistent
with the guidelines, updating the field to use an Array.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: I2652a5b0f276b8944454af5cb4b1383a3e054cfa
2020-03-18 17:40:24 +00:00
TreeHugger Robot
bd17a96675 [automerger skipped] Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev am: 1d204ac218 -s ours
am skip reason: Change-Id Iece9e8ad5c51170cd404ac995d0005392d37fe0c with SHA-1 7bd2a24dab is in history

Change-Id: I9e4295ca98aa16dbee863c6a1f7475c59785db18
2020-03-18 12:08:31 +00:00
TreeHugger Robot
1d204ac218 Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev 2020-03-18 11:49:09 +00:00
Lorenzo Colitti
7d505a6436 mtu: Add MTU parameter to Routes
- Change route to update existing route
- MTU parameter added to AddRoute

Bug: 142892223
Test: unit test
Change-Id: I2164808ef628eb7c12e875f0bde7f5151bf6a5b5
Merged-In: Ie339d0cee5be12c2232a4631fed61219a0facc64
(cherry picked from commit e521f07e8b03102f1b510a3fb401993513d9c127)
2020-03-18 11:18:37 +00:00
Chiachang Wang
6ba6520fd3 [automerger skipped] Merge changes I97015365,Ic9db4b9b into rvc-dev am: 13097923fa -s ours
am skip reason: Change-Id I97015365604be1846e3ecbaf60ac99e334705565 with SHA-1 fd007f01ef is in history

Change-Id: I4902fda4482ecad8ae6c38b32da0f40262cb316a
2020-03-18 10:30:21 +00:00
Chiachang Wang
13097923fa Merge changes I97015365,Ic9db4b9b into rvc-dev
* changes:
  Add NattKeepalivePacketDataTest
  Add KeepalivePacketDataTest
2020-03-18 10:15:15 +00:00
Junyu Lai
6d4e01e422 Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister
Test: atest ConnectivityServiceTest#testNetworkFactoryUnregister \
      --geneate-new-metrics 100
Bug: 151792032

Change-Id: I1ee7a26186885d3a79a32ec9e45f5bcd656a6680
Merged-In: I1ee7a26186885d3a79a32ec9e45f5bcd656a6680
Merged-In: Iece9e8ad5c51170cd404ac995d0005392d37fe0c
(cherry picked from commit 31c26cdbeb35a6fd6a53a1c25cce6d36b825bf41)
2020-03-18 10:09:44 +00:00