Commit Graph

9055 Commits

Author SHA1 Message Date
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
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
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
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
Lucas Lin
f72c60dd64 Merge "Add version check to prevent test fail on Android Q" am: 96da9cf154 am: ed930bec98 am: ad691b3e04
Change-Id: I11fea0bb6c92c617592c9341bf8eb98694a6aba9
2020-03-18 04:36:10 +00:00
Lucas Lin
ad691b3e04 Merge "Add version check to prevent test fail on Android Q" am: 96da9cf154 am: ed930bec98
Change-Id: I1985c4cfe6ff1712f2d181a151bfee0160fc96bf
2020-03-18 04:23:00 +00:00
Junyu Lai
90ae643a66 [automerger skipped] Merge "[SP25] Rename functions that add Entry conditionally" am: 6fa3bc3460 am: c3fb848e35 -s ours am: 1805ffac82 -s ours
am skip reason: Change-Id I9495a198cf247e6c79100f7ac1edcea370b071de with SHA-1 5d89df732b is in history

Change-Id: I214ca8cb07535dbe33be18aa9a49d31811451ff5
2020-03-18 04:16:40 +00:00
Lucas Lin
ed930bec98 Merge "Add version check to prevent test fail on Android Q" am: 96da9cf154
Change-Id: I61546d3dc488326a32386a7d6f4c87d857b29fbd
2020-03-18 04:10:21 +00:00
Junyu Lai
1805ffac82 [automerger skipped] Merge "[SP25] Rename functions that add Entry conditionally" am: 6fa3bc3460 am: c3fb848e35 -s ours
am skip reason: Change-Id I9495a198cf247e6c79100f7ac1edcea370b071de with SHA-1 5d89df732b is in history

Change-Id: I19399123661123386472ff3f39d268d85917cbe1
2020-03-18 04:02:05 +00:00
Lucas Lin
96da9cf154 Merge "Add version check to prevent test fail on Android Q" 2020-03-18 03:56:37 +00:00
Junyu Lai
c3fb848e35 Merge "[SP25] Rename functions that add Entry conditionally" am: 6fa3bc3460
Change-Id: I7e0698f0e60d4c26864ceb728b74a265351a8506
2020-03-18 03:45:41 +00:00
Junyu Lai
6fa3bc3460 Merge "[SP25] Rename functions that add Entry conditionally" 2020-03-18 03:16:41 +00:00
Junyu Lai
66bab7dd7e Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev am: 3e09da5d5d am: 53bdd05439 am: 9cfbea2907 am: 0dc138bdb2
Change-Id: Iecf1a331ab6d9d169dbf7e17ed25550d0aaedc63
2020-03-18 00:44:14 +00:00
junyulai
58b4c2090f [SP25] Rename functions that add Entry conditionally am: 5d89df732b am: 69e146bbc5 am: e7b24a29b1 am: b1dba8403b
Change-Id: I521740ccd3ab7e2bd9c4eced948b4d50ce5de47d
2020-03-18 00:39:35 +00:00
junyulai
727d3d99d3 [automerger skipped] [SP24] Rename functions that add Entry unconditionally am: 9f288e6990 am: bf8e5cf064 -s ours am: d766a38e36 -s ours am: 08f592e30b -s ours
am skip reason: Change-Id I801ddc49e283a254b9586700c9b597c0adb0d459 with SHA-1 9f288e6990 is in history

Change-Id: I5725640357aabd261cf72b9fae530ad156f0d86d
2020-03-18 00:39:33 +00:00
junyulai
2ca49e8ad4 [automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a am: 43ff860cf2 -s ours am: 5f7339c644 -s ours am: a54c216cf9 -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 2cb4c9359a is in history

Change-Id: I9e09cf7be805757e5e76fddb7831c6f09d0c6bf7
2020-03-18 00:39:28 +00:00
Junyu Lai
d92c230dc7 Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev am: 3e09da5d5d am: 3e5cf4797b am: 35ed012437 am: 8033ab1788
Change-Id: I54bfdf98273ed4c78f035124edb2fb5a6aa9a7f2
2020-03-18 00:37:18 +00:00
junyulai
0a37411c82 [SP25] Rename functions that add Entry conditionally am: 5d89df732b am: 0dbffa4ad5 am: 451c47629e am: c3d7524be0
Change-Id: Ia0473dc09f439216321e4571aa0b1e6c01e68173
2020-03-18 00:33:47 +00:00
junyulai
b3655ae519 [automerger skipped] [SP24] Rename functions that add Entry unconditionally am: 9f288e6990 -s ours am: 08da9375a6 -s ours am: 6a7726457c -s ours am: 62feb0da00 -s ours
am skip reason: Change-Id I801ddc49e283a254b9586700c9b597c0adb0d459 with SHA-1 2521ad7386 is in history

Change-Id: I3e643366f1932d99e068e7afbab29f6281bf1796
2020-03-18 00:33:44 +00:00
junyulai
127bfee382 [automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a -s ours am: 180557c20a -s ours am: 76a9658f9e -s ours am: 809ac22e18 -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 f8660076c0 is in history

Change-Id: Id1ee0b834ff1f6ec0e79316657e8a87e393605c1
2020-03-18 00:33:38 +00:00