Commit Graph

2680 Commits

Author SHA1 Message Date
Junyu Lai
1693b22869 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: cdd7c94ec0 am: f4c980e3ec -s ours am: 4aa2976d45 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 f0fcc339c3 is in history

Change-Id: I8af177e7714eeed230a0781016e240ebce6e95eb
2020-04-15 19:13:47 +00:00
Junyu Lai
4736aa3be2 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: cdd7c94ec0 am: 5f8004030c am: 1d6b5dfc14 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 f0fcc339c3 is in history

Change-Id: Iac21e8421c0de2ef41edd1ac82488c352029631a
2020-04-15 19:00:17 +00:00
Junyu Lai
97f3556501 Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: cdd7c94ec0 am: 5f8004030c am: edd5229bb5 am: b3e4446eb3
Change-Id: I8c4e71f3d64b6cea509d5e8654ed919fcf7d4108
2020-04-15 18:49:11 +00:00
Junyu Lai
4aa2976d45 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: cdd7c94ec0 am: f4c980e3ec -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 f0fcc339c3 is in history

Change-Id: Idade28f3ca80b48d8d56d3584cbf195c2f250c40
2020-04-15 17:58:23 +00:00
Junyu Lai
1d6b5dfc14 Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: cdd7c94ec0 am: 5f8004030c
Change-Id: I883b3b8d699bda1b640992b621b547048f057807
2020-04-15 17:48:41 +00:00
Junyu Lai
f4c980e3ec Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: cdd7c94ec0
Change-Id: I5dd2e734cd8ce6637c39e57a6b302447bc0f295f
2020-04-15 17:26:19 +00:00
junyulai
f0fcc339c3 [SM10] Adopt helper class to monitor RAT type change per sub
Test: atest NetworkStatsServiceTest
Bug: 146415925
Change-Id: I45c3aa9046b316c8cd0943543d620a22e4afefd1
Merged-In: I45c3aa9046b316c8cd0943543d620a22e4afefd1
(cherry picked from commit 219faff07bdc58c14fe58fc525e86383db1f8167)
2020-04-15 10:30:49 +00:00
Jeff Sharkey
7bab8e86df Narrow access to getDataLayerSnapshotForUid().
This method is used in TrafficStats to obtain the snapshot for the
calling UID, so narrow it to only return data for that specific case.

We might be tempted to throw an exception or adjust the method
signature, but apps are using the raw AIDL in the greylist, so we
return them an empty NetworkStats if they ask about other UIDs.

Bug: 119672472
Test: manual
Change-Id: I3064630039f1d8473d6425dd663f17813a4ae3a1
2020-04-10 13:54:45 -06:00
Xin Li
4e8d5a067d [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: f68e6a03f1 -s ours am: b82e17d4ae am: 15bcf41116
Change-Id: I91747ec5175ea6af1f80ddf7ff5da9e1b7be06ff
2020-04-10 19:46:36 +00:00
Xin Li
15bcf41116 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: f68e6a03f1 -s ours am: b82e17d4ae
Change-Id: Iacf67657f069b367dc7c7b8aff7d3a292853ea0e
2020-04-10 19:27:37 +00:00
Xin Li
b82e17d4ae [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: f68e6a03f1 -s ours
am skip reason: subject contains skip directive

Change-Id: I99ef66bbbf796a104bedf3da2909e47cbe023f6f
2020-04-10 19:07:11 +00:00
Automerger Merge Worker
5a316e581e Merge "Merge "[SM09] Add helper class to monitor RAT type change per sub" am: 64ccb88948 am: 57aa3c8c94" into qt-qpr1-dev-plus-aosp 2020-04-09 11:06:06 +00:00
Treehugger Robot
49e6672c9b Merge "[SM09] Add helper class to monitor RAT type change per sub" am: 64ccb88948 am: 57aa3c8c94
Change-Id: I182886d7fd1e9dad96c43c339bda7acf1c749397
2020-04-09 11:05:45 +00:00
Treehugger Robot
c2aeed7fe2 [automerger skipped] Merge "[SM09] Add helper class to monitor RAT type change per sub" am: 64ccb88948 am: 57aa3c8c94 -s ours am: dabeb3d324 -s ours am: 6267627114 -s ours
am skip reason: Change-Id I0055f6b55c209a073ce997fc7a144477f9db7069 with SHA-1 5d0d638f54 is in history

Change-Id: Ifc2215c9893e017f41b0eb40b56cf9fd721f3df8
2020-04-09 10:52:18 +00:00
Treehugger Robot
6267627114 [automerger skipped] Merge "[SM09] Add helper class to monitor RAT type change per sub" am: 64ccb88948 am: 57aa3c8c94 -s ours am: dabeb3d324 -s ours
am skip reason: Change-Id I0055f6b55c209a073ce997fc7a144477f9db7069 with SHA-1 5d0d638f54 is in history

Change-Id: I767a4965451d5304f41ba0033ecffdbcb42f6a1f
2020-04-09 10:31:21 +00:00
Treehugger Robot
dabeb3d324 [automerger skipped] Merge "[SM09] Add helper class to monitor RAT type change per sub" am: 64ccb88948 am: 57aa3c8c94 -s ours
am skip reason: Change-Id I0055f6b55c209a073ce997fc7a144477f9db7069 with SHA-1 5d0d638f54 is in history

Change-Id: I7ebe73a3ffffaae14a1f557a9f15136e460b2969
2020-04-09 10:30:33 +00:00
Treehugger Robot
e8bbe6d329 Merge "[SM09] Add helper class to monitor RAT type change per sub" am: 64ccb88948 am: 57aa3c8c94
Change-Id: Ic269c912268a9c8cd6a4fc9f9e3f2a28a54d88be
2020-04-09 10:23:17 +00:00
Treehugger Robot
57aa3c8c94 Merge "[SM09] Add helper class to monitor RAT type change per sub" am: 64ccb88948
Change-Id: I27acccfe6e8c892090a979dd3c2f96970627fdac
2020-04-09 08:21:21 +00:00
junyulai
af1b5c3f4f [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 ag/10977156 and fixed conflict)
2020-04-09 07:11:17 +00:00
android-build-team Robot
a260c33fe5 Snap for 6379507 from c14806197cb453e8e26558adf8c02db9567c036a to mainline-release
Change-Id: I2ddc68634a691db6c6321d47e2ac69e6f6637ead
2020-04-09 07:10:02 +00:00
android-build-team Robot
4caf0b45ef Snap for 6378851 from a23f461e1b75c50692c41e5eb4cb41e1922c9608 to rvc-release
Change-Id: I95095b7a4b626e3119f61e68a3e9de5355b740a3
2020-04-09 02:11:07 +00:00
Automerger Merge Worker
90e613dbd0 [automerger skipped] Merge "Merge "[SM09] Add helper class to monitor RAT type change per sub" into rvc-dev am: cc0c65dbb5 am: 7aaca95d10" into rvc-d1-dev-plus-aosp am: c1aa331033 -s ours
am skip reason: Change-Id I0055f6b55c209a073ce997fc7a144477f9db7069 with SHA-1 5d0d638f54 is in history

Change-Id: I5249d1f1cec8cdeb9dfdf650c7c6d868bae68fec
2020-04-08 11:02:18 +00:00
Junyu Lai
0bafdb1a43 Merge "[SM09] Add helper class to monitor RAT type change per sub" into rvc-dev am: cc0c65dbb5 am: 07fc92be9c am: 3cb1756d7e
Change-Id: I98c66fc87e18a6c1606d46349b903735ce3bb637
2020-04-08 11:01:45 +00:00
Automerger Merge Worker
c1aa331033 Merge "Merge "[SM09] Add helper class to monitor RAT type change per sub" into rvc-dev am: cc0c65dbb5 am: 7aaca95d10" into rvc-d1-dev-plus-aosp 2020-04-08 10:47:48 +00:00
Junyu Lai
3086d8ccbc Merge "[SM09] Add helper class to monitor RAT type change per sub" into rvc-dev am: cc0c65dbb5 am: 7aaca95d10
Change-Id: I50f05bf5de55707e9758f7ffef6da8711c651cbf
2020-04-08 10:47:39 +00:00
Junyu Lai
3cb1756d7e Merge "[SM09] Add helper class to monitor RAT type change per sub" into rvc-dev am: cc0c65dbb5 am: 07fc92be9c
Change-Id: Ie9fa235f79a8fd7c5118e53972f68ae8505e6637
2020-04-08 10:47:33 +00:00
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