LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,071 Commits 2 Branches 0 Tags
0b95f7b4ec5ae03e4e6d3a2e3ec95e5b0245562b
Commit Graph

9071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
0b95f7b4ec Merge "Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev am: cb9847691f am: bb1c456796" into rvc-d1-dev-plus-aosp am: 85365d3307 am: e1fcc3ece4 
Change-Id: Ib240060a44f64a3fcd11db23f119cfa4e3eb9564
 2020-03-18 20:21:45 +00:00
Automerger Merge Worker
96bf69d090 Merge "Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev am: cb9847691f am: 75ee711747" into rvc-d1-dev-plus-aosp am: 586d5b031f am: ef99b2efd8 
Change-Id: Iefa09c096d3cf5edee59ebc1c1038ba6f7ee36af
 2020-03-18 20:20:15 +00:00
Cody Kesting
3657c3b052 Change NetworkCapabilities administrator UIDs to be stored as int[]. am: 1043927267 am: a5195fd1cb am: 9ac1fc8dc1 am: b3521a5e7f 
Change-Id: Ib80d4fb966fd9f45154bcf9591e1f499acdee09a
 2020-03-18 20:19:29 +00:00
Cody Kesting
9062ae1179 Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev am: cb9847691f am: bb1c456796 
Change-Id: I6090feb9537e460b3cd5ebd392734ff96e858b9b
 2020-03-18 20:07:11 +00:00
Cody Kesting
ee5d79c06d Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev am: cb9847691f am: 75ee711747 
Change-Id: I66ff4f2cc559c52e2265c8cecbbd6b9b9d3c1164
 2020-03-18 20:06:15 +00:00
Cody Kesting
9ac1fc8dc1 Change NetworkCapabilities administrator UIDs to be stored as int[]. am: 1043927267 am: a5195fd1cb 
Change-Id: Ide9d239f813e8bff804d5e1a03f5dedee8e8edc1
 2020-03-18 20:05:43 +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
bb1c456796 Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev am: cb9847691f 
Change-Id: Idda185ca62848f66bd1a08455db9e0df7fe964d5
 2020-03-18 19:44:00 +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
Junyu Lai
1f36b6a659 Merge "[SM08] Add NetworkTemplate unit test for fetching mobile data usage" 2020-03-18 14:16:59 +00:00
Automerger Merge Worker
6c6d79debb Merge "[automerger skipped] Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev am: 1d204ac218 -s ours" into rvc-dev-plus-aosp am: cac4f8871a -s ours am: a1851ed538 -s ours am: 704517a266 -s ours 
am skip reason: Change-Id I1ee7a26186885d3a79a32ec9e45f5bcd656a6680 with SHA-1 6d4e01e422 is in history

Change-Id: Ia273ebc0da7d8e9350c46e70b75c37f7873e0e6d
 2020-03-18 13:10:15 +00:00
TreeHugger Robot
1e01af8b31 [automerger skipped] Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev am: 1d204ac218 am: cbd17dab27 -s ours am: b0e5017016 -s ours am: ff944e90cc -s ours 
am skip reason: Change-Id I1ee7a26186885d3a79a32ec9e45f5bcd656a6680 with SHA-1 7872f6186a is in history

Change-Id: Ie2b83cef52d46ced9f3ba9b69b61b93c209fcd85
 2020-03-18 13:08:45 +00:00
Automerger Merge Worker
a1851ed538 Merge "[automerger skipped] Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev am: 1d204ac218 -s ours" into rvc-dev-plus-aosp am: cac4f8871a -s ours 
am skip reason: Change-Id I1ee7a26186885d3a79a32ec9e45f5bcd656a6680 with SHA-1 6d4e01e422 is in history

Change-Id: Iee0852500679aff2fca108713cca2109caa7d677
 2020-03-18 12:37:09 +00:00
TreeHugger Robot
b0e5017016 [automerger skipped] Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev am: 1d204ac218 am: cbd17dab27 -s ours 
am skip reason: Change-Id Iece9e8ad5c51170cd404ac995d0005392d37fe0c with SHA-1 7bd2a24dab is in history

Change-Id: I48199e3bc051ba4d5e0c0a9309f8772c76935218
 2020-03-18 12:36:24 +00:00
Junyu Lai
a5df29c24c Merge "[SM07] Make combine subtype configurable from Settings" 2020-03-18 12:20:39 +00:00
TreeHugger Robot
cbd17dab27 Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev am: 1d204ac218 
Change-Id: I8b43f896064dddb84986b5a8d6edad1116028a5b
 2020-03-18 12:08:46 +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
Automerger Merge Worker
51207202bf [automerger skipped] Merge changes from topic "am-11d75c56d938476ab6f718fc0579e0a9" into rvc-d1-dev-plus-aosp am: 050604626b -s ours am: 2a27952187 -s ours 
am skip reason: Change-Id I97015365604be1846e3ecbaf60ac99e334705565 with SHA-1 30a0107d13 is in history

Change-Id: I899f29a2623887f9907b2543f0a3dbeeb5addfa4
 2020-03-18 11:23:07 +00:00
Chiachang Wang
4060769d49 [automerger skipped] Merge changes I97015365,Ic9db4b9b into rvc-dev am: 13097923fa -s ours am: 6ba6520fd3 -s ours am: 79fe9214a4 -s ours am: ce33d07ee7 -s ours 
am skip reason: Change-Id I97015365604be1846e3ecbaf60ac99e334705565 with SHA-1 fd007f01ef is in history

Change-Id: Ice8694d16de54bed09e66965d81e1d9776ca62c7
 2020-03-18 11:22:57 +00:00
Automerger Merge Worker
050604626b Merge changes from topic "am-11d75c56d938476ab6f718fc0579e0a9" into rvc-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge changes I97015365,Ic9db4b9b into rvc-dev am: 13097923fa am: ac1cb7ea7d -s ours
  [automerger skipped] Add KeepalivePacketDataTest am: 62de8657e2 am: 50a55f9440 -s ours
 2020-03-18 10:47:30 +00:00
Chiachang Wang
db2b02f0cf [automerger skipped] Merge changes I97015365,Ic9db4b9b into rvc-dev am: 13097923fa am: ac1cb7ea7d -s ours 
am skip reason: Change-Id I97015365604be1846e3ecbaf60ac99e334705565 with SHA-1 fd007f01ef is in history

Change-Id: I07fe90085cb201a3280241773282e14be9ce904a
 2020-03-18 10:47:25 +00:00
Chiachang Wang
79fe9214a4 [automerger skipped] Merge changes I97015365,Ic9db4b9b into rvc-dev am: 13097923fa -s ours am: 6ba6520fd3 -s ours 
am skip reason: Change-Id I97015365604be1846e3ecbaf60ac99e334705565 with SHA-1 fd007f01ef is in history

Change-Id: I2c35e18c06e3d26d35a76ec3041a674148c8efc7
 2020-03-18 10:47:21 +00:00
Chiachang Wang
73c3812176 [automerger skipped] Add KeepalivePacketDataTest am: 62de8657e2 am: 50a55f9440 -s ours 
am skip reason: Change-Id Ic9db4b9b83ff96c87f41c5f381763c3ee8dd27c8 with SHA-1 13c97ebd73 is in history

Change-Id: I5c099a4d59f8bb081be89496556c767d0cf414db
 2020-03-18 10:47:20 +00:00
Chiachang Wang
ac1cb7ea7d Merge changes I97015365,Ic9db4b9b into rvc-dev am: 13097923fa 
Change-Id: Iadb42d352270a053e3fb5682c65ec9feb3d1b4b0
 2020-03-18 10:31:22 +00:00
Chiachang Wang
50a55f9440 Add KeepalivePacketDataTest am: 62de8657e2 
Change-Id: I1bff4ae03f4b56376d28514dc232b528dca99603
 2020-03-18 10:31:18 +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
junyulai
d63ba64c52 [SM08] Add NetworkTemplate unit test for fetching mobile data usage 
Test: atest NetworkTemplateTest
Bug: 129082217

Change-Id: I7eaca623adf93f9b8d53c2e5857ecae90ea572ab
 2020-03-18 18:04:18 +08:00
Junyu Lai
7872f6186a Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" am: e9e871ef83 am: ef43214f03 am: 0851670d30 am: 69a6311c32 am: b608deec66 
Change-Id: I1ee7a26186885d3a79a32ec9e45f5bcd656a6680
 2020-03-18 10:01:45 +00:00
junyulai
8e0fc53cfe [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
 2020-03-18 17:58:14 +08:00
Junyu Lai
69a6311c32 Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" am: e9e871ef83 am: ef43214f03 am: 0851670d30 
Change-Id: I5c68b88d7e39be0c04fc08d4e4f7d2b61231f0fb
 2020-03-18 09:23:21 +00:00
Junyu Lai
0851670d30 Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" am: e9e871ef83 am: ef43214f03 
Change-Id: I941bdbd6877dbf5e269ee4e49fd3947681025961
 2020-03-18 09:02:12 +00:00
Junyu Lai
ef43214f03 Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" am: e9e871ef83 
Change-Id: I93da1059a21adcf14f8c036c17963a07b1db964d
 2020-03-18 08:55:01 +00:00
Junyu Lai
e9e871ef83 Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" 2020-03-18 08:41:08 +00:00
Lorenzo Colitti
0fc574664c Merge "mtu: Add MTU parameter to Routes" am: b76fc089d7 am: aa3afd9d64 am: b7dbb0b230 am: 8e9d7e2b40 am: fe65a99b43 
Change-Id: Ib7fe339df5518a0f783cb1d4624e86c686cd6c2d
 2020-03-18 08:37:24 +00:00
Lorenzo Colitti
8e9d7e2b40 Merge "mtu: Add MTU parameter to Routes" am: b76fc089d7 am: aa3afd9d64 am: b7dbb0b230 
Change-Id: I2c7695a5835d7ca05936d1f18c9cdd2003ecf925
 2020-03-18 08:06:02 +00:00
Lorenzo Colitti
b7dbb0b230 Merge "mtu: Add MTU parameter to Routes" am: b76fc089d7 am: aa3afd9d64 
Change-Id: I2164808ef628eb7c12e875f0bde7f5151bf6a5b5
 2020-03-18 07:52:25 +00:00
Junyu Lai
6ac0d280bc Merge changes If330e853,Ie2d229be,Ic6b2f10f 
* changes:
  [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-18 07:36:40 +00:00
Lorenzo Colitti
aa3afd9d64 Merge "mtu: Add MTU parameter to Routes" am: b76fc089d7 
Change-Id: I3c730b35133c62db6723a58835e7f9d3874c124b
 2020-03-18 07:34:11 +00:00
junyulai
7bd2a24dab Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister 
Test: atest ConnectivityServiceTest#testNetworkFactoryUnregister \
      --geneate-new-metrics 100
Bug: 151792032
Change-Id: Iece9e8ad5c51170cd404ac995d0005392d37fe0c
 2020-03-18 15:22:54 +08:00
Lorenzo Colitti
b76fc089d7 Merge "mtu: Add MTU parameter to Routes" 2020-03-18 07:20:01 +00:00
Chiachang Wang
30a0107d13 Add NattKeepalivePacketDataTest 
Add test for constructor and parcel

Test: atest CtsNetTestCasesLatestSdk:android.net.NattKeepalivePacketDataTest
      on both Q and R devices
Bug: 151402211
Change-Id: I97015365604be1846e3ecbaf60ac99e334705565
Merged-In: I97015365604be1846e3ecbaf60ac99e334705565
 2020-03-18 05:44:26 +00:00
Chiachang Wang
62de8657e2 Add KeepalivePacketDataTest 
Add test for constructor of KeepalivePacketData and
InvalidPacketException

Bug: 151109466
Test: atest CtsNetTestCasesLatestSdk:android.net.KeepalivePacketDataTest
      on both Q and R devices
Change-Id: Ic9db4b9b83ff96c87f41c5f381763c3ee8dd27c8
Merged-In: Ic9db4b9b83ff96c87f41c5f381763c3ee8dd27c8
 2020-03-18 05:43:42 +00:00
junyulai
a7117e41a2 [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
 2020-03-18 12:59:07 +08:00
Lucas Lin
5417bfda8b Merge "Add version check to prevent test fail on Android Q" am: 96da9cf154 am: ed930bec98 am: ad691b3e04 am: f72c60dd64 am: 21406119f2 
Change-Id: I8356aed1bdf2646671d045e10c9d0c8115c10ca5
 2020-03-18 04:50:58 +00:00
Junyu Lai
d6a52674f9 [automerger skipped] Merge "[SP25] Rename functions that add Entry conditionally" am: 6fa3bc3460 am: c3fb848e35 -s ours am: 1805ffac82 -s ours am: 90ae643a66 -s ours am: 5b83556173 -s ours 
am skip reason: Change-Id I9495a198cf247e6c79100f7ac1edcea370b071de with SHA-1 5d89df732b is in history

Change-Id: I0a3f09c46eef66ec405a98c213ed1fa64638dd4c
 2020-03-18 04:49:05 +00:00