Commit Graph

2704 Commits

Author SHA1 Message Date
Junyu Lai
7aaca95d10 Merge "[SM09] Add helper class to monitor RAT type change per sub" into rvc-dev am: cc0c65dbb5
Change-Id: I95d1a1c1931c194c7f751a444e669adc16a65897
2020-04-08 10:35:10 +00:00
junyulai
5d0d638f54 [SM09] Add helper class to monitor RAT type change per sub
In current design, Rat type change in NSS is only for default
subscription. This is only correct for single sim project.
However, it does not correct for multi-sim scenarios such as
CBRS or DSDS, given that all data usage will be attributed
to the Rat type of default sub.

Thus, add a helper class to monitor subscription change event,
and register/unregister dynamically for Rat type change for
every subscription.

Note that unit test of the helper class will be addressed
in follow-up patch.

Test: m -j
Bug: 146415925
Change-Id: I0055f6b55c209a073ce997fc7a144477f9db7069
Merged-In: I0055f6b55c209a073ce997fc7a144477f9db7069
(cherry picked from commit 306de26c138ec135846f2a74a952464cf00dce54)
2020-04-08 08:50:22 +00:00
android-build-team Robot
2f8d37e38b Snap for 6371019 from 6f2fc99fbd543302f40049fd6c493a676cda4406 to mainline-release
Change-Id: I077942e37c7aa4ca802240ecbe1b0237249b97ba
2020-04-07 07:12:22 +00:00
android-build-team Robot
de7df19396 Snap for 6370344 from d5729ebc66f333af206c96e81f9e1c18129d7f83 to rvc-release
Change-Id: Ia051ce889de0ccce3eb4d428daee4e33d7f23046
2020-04-07 02:05:37 +00:00
Junyu Lai
2b1e3f371d [automerger skipped] Merge changes from topic "am-5ce58db354ac494a84904378ca35c013-rvc-dev" into rvc-dev am: ae9a901cbb -s ours am: 1d29cc9ca2 -s ours am: ad0f8d4c5e -s ours
am skip reason: Change-Id I690704b43cfd16de70c4c83916f6d750cf613f67 with SHA-1 6ec40a86dd is in history

Change-Id: Iead15065852fcac0881fc7717e79810c8e4742b9
2020-04-06 05:13:14 +00:00
junyulai
989815d43e [automerger skipped] [SP26.2] add a method in NetworkStats that removes empty entries am: d81034383d am: f3c0573441 -s ours am: 99f9ef95c3 -s ours
am skip reason: Change-Id I40a76935d55712b8083ee1e17e137a8a4ef5e029 with SHA-1 5d9bc0c75e is in history

Change-Id: Id556fb50e76424bbffdf6f83cd87cfb87cd2aff3
2020-04-06 05:12:12 +00:00
Junyu Lai
ad0f8d4c5e [automerger skipped] Merge changes from topic "am-5ce58db354ac494a84904378ca35c013-rvc-dev" into rvc-dev am: ae9a901cbb -s ours am: 1d29cc9ca2 -s ours
am skip reason: Change-Id I690704b43cfd16de70c4c83916f6d750cf613f67 with SHA-1 6ec40a86dd is in history

Change-Id: I91c97fec88b2275764d5804523a39922c6257340
2020-04-06 04:52:38 +00:00
junyulai
99f9ef95c3 [automerger skipped] [SP26.2] add a method in NetworkStats that removes empty entries am: d81034383d am: f3c0573441 -s ours
am skip reason: Change-Id I40a76935d55712b8083ee1e17e137a8a4ef5e029 with SHA-1 5d9bc0c75e is in history

Change-Id: If3793def11b38b66cc7dd788af82f6c0f394cd99
2020-04-06 04:52:05 +00:00
Junyu Lai
1d29cc9ca2 [automerger skipped] Merge changes from topic "am-5ce58db354ac494a84904378ca35c013-rvc-dev" into rvc-dev am: ae9a901cbb -s ours
am skip reason: Change-Id I690704b43cfd16de70c4c83916f6d750cf613f67 with SHA-1 863f390810 is in history

Change-Id: I1a97a8cb46302c29425781b9252640c1eec4b50b
2020-04-06 04:27:56 +00:00
junyulai
d81034383d [SP26.2] add a method in NetworkStats that removes empty entries
In current design, entries with zeros are preserved after
addition/subtraction. These entries are not very useful
and lead to difficulty of verifying the result of
addition/subtraction.

However, change the behavior in the original NetworkStats
is considered risky in current stage.

Thus, this change provide a function that could remove these
empty entries in tests.

Test: atest FrameworksNetTests
Bug: 152827872
Bug: 150644692

Change-Id: I40a76935d55712b8083ee1e17e137a8a4ef5e029
Merged-In: I40a76935d55712b8083ee1e17e137a8a4ef5e029
(cherry picked from commit 6c7bef3064dbe949b7b213036b8e70c125ddd343)
2020-04-06 02:18:50 +00:00
android-build-team Robot
6170705614 Snap for 6357740 from 4c6e6b9c5a4fb640da0daf20bb42cfa158d961aa to mainline-release
Change-Id: I8e3b3b8da0b0dac54ffc8c632d75ea2261968136
2020-04-02 07:10:37 +00:00
Junyu Lai
6828f001b6 Merge changes from topic "sp26-networkstats-cts" am: 4d4ddc78cf am: d9074a21fc am: b1c77732ee am: da6f50ce5e
Change-Id: I90f366660e6b4d25972b4d3708a9a05d0678bc60
2020-04-02 03:35:39 +00:00
junyulai
8e837d8de2 [SP26.2] add a method in NetworkStats that removes empty entries am: 5d9bc0c75e am: ba57ab6eb9 am: 06a3b668d3 am: b75b73fcdc
Change-Id: Ie5acbb0d825e210c5217517935ef816a8dfd666e
2020-04-02 03:35:35 +00:00
Junyu Lai
da6f50ce5e Merge changes from topic "sp26-networkstats-cts" am: 4d4ddc78cf am: d9074a21fc am: b1c77732ee
Change-Id: I0dc9884b3f36ecc6678d741d74e5c85ac0756378
2020-04-02 03:11:17 +00:00
junyulai
b75b73fcdc [SP26.2] add a method in NetworkStats that removes empty entries am: 5d9bc0c75e am: ba57ab6eb9 am: 06a3b668d3
Change-Id: Ice87baf7326ad333b611a348b3bceebe71d0858e
2020-04-02 03:11:14 +00:00
Junyu Lai
c5c5992227 Merge changes from topic "sp26-networkstats-cts" am: 4d4ddc78cf am: d9074a21fc
Change-Id: Icd22765bf76b3b37935928169722afed65469105
2020-04-02 02:41:02 +00:00
junyulai
aa5c856269 [SP26.2] add a method in NetworkStats that removes empty entries am: 5d9bc0c75e am: ba57ab6eb9
Change-Id: I99eef67c05afb7d6432d5dbf32494d2f5b56b1a5
2020-04-02 02:41:00 +00:00
Junyu Lai
b1c77732ee Merge changes from topic "sp26-networkstats-cts" am: 4d4ddc78cf am: d9074a21fc
Change-Id: I0964b1752acbba767135c960aba12f169b3f852c
2020-04-02 02:40:53 +00:00
junyulai
06a3b668d3 [SP26.2] add a method in NetworkStats that removes empty entries am: 5d9bc0c75e am: ba57ab6eb9
Change-Id: I388b1d3677d362da2595739913880efa9a643a03
2020-04-02 02:40:42 +00:00
Junyu Lai
d9074a21fc Merge changes from topic "sp26-networkstats-cts" am: 4d4ddc78cf
Change-Id: I124f0def6fdaad8f1726df23edc87b6aa7856586
2020-04-02 02:21:26 +00:00
junyulai
ba57ab6eb9 [SP26.2] add a method in NetworkStats that removes empty entries am: 5d9bc0c75e
Change-Id: Ieee0896672625f3bab9ec02a5efa495a9d1f001b
2020-04-02 02:21:20 +00:00
android-build-team Robot
4128dfbb7a Snap for 6357023 from a957475923108063af3ec244042df20b74cbb4f3 to rvc-release
Change-Id: Id122ed286906bb61dbb2310805eccca8a6122c73
2020-04-02 02:04:43 +00:00
Junyu Lai
4d4ddc78cf Merge changes from topic "sp26-networkstats-cts"
* changes:
  [SP26] add CTS for NetworkStats
  [SP26.2] add a method in NetworkStats that removes empty entries
2020-04-02 02:00:59 +00:00
junyulai
5d9bc0c75e [SP26.2] add a method in NetworkStats that removes empty entries
In current design, entries with zeros are preserved after
addition/subtraction. These entries are not very useful
and lead to difficulty of verifying the result of
addition/subtraction.

However, change the behavior in the original NetworkStats
is considered risky in current stage.

Thus, this change provide a function that could remove these
empty entries in tests.

Test: atest FrameworksNetTests
Bug: 152827872
Bug: 150644692
Change-Id: I40a76935d55712b8083ee1e17e137a8a4ef5e029
2020-04-01 16:46:08 +08:00
android-build-team Robot
4dd3f945ff Snap for 6353135 from 79b40a2f164a9238f3aa5a30817e8d07c2265cf5 to mainline-release
Change-Id: Idb07acb34245ee84804340740357b081538e2e72
2020-04-01 07:09:35 +00:00
android-build-team Robot
dd7d4c668f Snap for 6353066 from d9f9a8d70f9af4769cbdaab366285408dcf89e0e to rvc-release
Change-Id: Ia9e4d7125d6cbdb552b59ee81e27873c094550d5
2020-04-01 02:04:53 +00:00
TreeHugger Robot
b633d576dc [automerger skipped] Merge "[SM06] Collect mobile NetworkStats metrics by collapsed rat type" into rvc-dev am: 8444a9440f am: de5bb18c21 am: a64bd6d19e -s ours
am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 eba72cd4ef is in history

Change-Id: I279ba57ed4ab65b0f792aab70d6d8bf0acd1cad2
2020-04-01 01:58:41 +00:00
TreeHugger Robot
a2ec575105 Merge "[SM06] Collect mobile NetworkStats metrics by collapsed rat type" into rvc-dev am: 8444a9440f am: 1596f03415 am: a811598819
Change-Id: I20094e727128555699ca442ba6e7b65933a82e51
2020-04-01 01:57:59 +00:00
TreeHugger Robot
a64bd6d19e Merge "[SM06] Collect mobile NetworkStats metrics by collapsed rat type" into rvc-dev am: 8444a9440f am: de5bb18c21
Change-Id: Ica3bb4d054510662993c7c4958321fa93b7a8c4d
2020-04-01 01:39:58 +00:00
TreeHugger Robot
a811598819 Merge "[SM06] Collect mobile NetworkStats metrics by collapsed rat type" into rvc-dev am: 8444a9440f am: 1596f03415
Change-Id: Ib1f614fcbd49b8b0fbc9a37cca0800664a23f425
2020-04-01 01:39:39 +00:00
TreeHugger Robot
de5bb18c21 Merge "[SM06] Collect mobile NetworkStats metrics by collapsed rat type" into rvc-dev am: 8444a9440f
Change-Id: I70609ad40ecb40a8b6b352e6789a4900313f91fb
2020-04-01 01:29:09 +00:00
TreeHugger Robot
8444a9440f Merge "[SM06] Collect mobile NetworkStats metrics by collapsed rat type" into rvc-dev 2020-04-01 01:12:41 +00:00
Benedict Wong
407024c9c1 [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b053 -s ours am: 3ebc200d00 -s ours am: f3763681e4 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 3fafd684c5 is in history

Change-Id: I7403a396513cbd4990c444971714a9215712e766
2020-03-31 20:37:34 +00:00
Benedict Wong
f3763681e4 [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b053 -s ours am: 3ebc200d00 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 3fafd684c5 is in history

Change-Id: I8e5cf4b83f05068ca2715b9715204af268320ca0
2020-03-31 20:15:44 +00:00
Lorenzo Colitti
8e6d7b26de [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 -s ours am: 8375dbdb87 -s ours am: 5b8a95cb93 -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 fd266f85b6 is in history

Change-Id: Ibd673f45a1f294c637a81e93b43d38c79f64f6ee
2020-03-31 18:02:46 +00:00
Lorenzo Colitti
5b8a95cb93 [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 -s ours am: 8375dbdb87 -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 fd266f85b6 is in history

Change-Id: I55dc1361e00724cce808fec175d57281e88d28ac
2020-03-31 17:52:51 +00:00
Benedict Wong
1bd41c7f71 [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b053 am: 175fa3c682 -s ours am: 95f6343d7a -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 529e8aae25 is in history

Change-Id: I669f28648e3d6c912ab48df415e164def0c9a1a2
2020-03-31 17:40:17 +00:00
Benedict Wong
95f6343d7a [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b053 am: 175fa3c682 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 529e8aae25 is in history

Change-Id: I192079b09c3fc9292fabc2208059f2c8698a9e4d
2020-03-31 17:35:12 +00:00
Benedict Wong
3ebc200d00 [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b053 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 529e8aae25 is in history

Change-Id: I10aae07c044231d9b6fcdd61488a146b21d8dd8f
2020-03-31 17:03:21 +00:00
junyulai
eba72cd4ef [SM06] Collect mobile NetworkStats metrics by collapsed rat type
Test: adb shell cmd stats pull-source 10000~10003
      adb shell dumpsys netstats --uid
Bug: 129082217

Change-Id: I726e74f5c63a6ed456cb13ea259b58c7a33bec76
Merged-In: I726e74f5c63a6ed456cb13ea259b58c7a33bec76
(cherry picked from commit c82dfeb4225e1a8a17eedc969a90f921e0bf845c)
2020-03-31 09:25:27 +00:00
android-build-team Robot
6d31d03ee0 Snap for 6349563 from 366b79483cc59e01723e782ce103d94db7feda72 to mainline-release
Change-Id: Ic45dcd2ecb2f15642261f4aeed488e0550f749fb
2020-03-31 07:09:36 +00:00
android-build-team Robot
756c7d52e4 Snap for 6348860 from 28fa2620497efc7b590d6e8eec5d3a11afaea48e to rvc-release
Change-Id: I1734224041e259bce83b032d83750cc1536d4ddb
2020-03-31 02:14:16 +00:00
Lorenzo Colitti
fbb7fba3dc [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 am: 52ad9bedc6 -s ours am: 05f0ce2252 -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 fd266f85b6 is in history

Change-Id: Ie2e40c3f320e57aee92dc6da90c79f324c5166dd
2020-03-30 19:03:34 +00:00
Lorenzo Colitti
05f0ce2252 [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 am: 52ad9bedc6 -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 7bcf9c28ac is in history

Change-Id: If0b5a493a4a8555a4ba40ab9c8a1ed528bd5343a
2020-03-30 18:51:03 +00:00
Lorenzo Colitti
96d80818a8 [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 am: 52ad9bedc6 am: 1408ee6d06 am: c8e8cdfe62 -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 7bcf9c28ac is in history

Change-Id: Ia9374a882a56ab6bac075931dc65409717ab2e84
2020-03-30 18:11:42 +00:00
Lorenzo Colitti
8375dbdb87 [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 7bcf9c28ac is in history

Change-Id: Icb265e846177c8ee1013529034534f46dec4de47
2020-03-30 07:06:45 +00:00
Daulet Zhanguzin
b59e6dbe5f [automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: f8098ddadf am: 35045271d1 -s ours am: a62847119f -s ours
am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 c120601182 is in history

Change-Id: I99ef30e8307aca34d78d1beb733b1ecd1b8d402e
2020-03-27 12:34:23 +00:00
Daulet Zhanguzin
a62847119f [automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: f8098ddadf am: 35045271d1 -s ours
am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 c120601182 is in history

Change-Id: Ib70273007ee56039d0645f33f59c677ea5f7b1aa
2020-03-27 12:28:12 +00:00
Daulet Zhanguzin
b87f6cd89c Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: f8098ddadf am: 35045271d1
Change-Id: I024e79fc24b8962ff6bd10e4b7c7fc4ad13cbf27
2020-03-27 12:27:58 +00:00
Daulet Zhanguzin
35045271d1 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: f8098ddadf
Change-Id: I9f9ba24036e19f568942466c866c7be23112c10a
2020-03-27 12:07:53 +00:00