Commit Graph

2337 Commits

Author SHA1 Message Date
Lucas Lin
cebc7b2b58 Merge "Broadcast ACTION_NETWORK_STATS_UPDATED in NetworkStatsHandler" am: 61fbce1bde am: 5ecaf8f36b am: 3f8ccb072e am: 24695d811a am: 3b0fd3e0df
Change-Id: I80569cb4388beb3fd6cbf64a7885bccee8b1c53c
2020-05-07 10:12:30 +00:00
Lucas Lin
3b0fd3e0df Merge "Broadcast ACTION_NETWORK_STATS_UPDATED in NetworkStatsHandler" am: 61fbce1bde am: 5ecaf8f36b am: 3f8ccb072e am: 24695d811a
Change-Id: I0069e6fa6eb8e57a7f4b806c60f5e31d98adebc9
2020-05-07 09:51:12 +00:00
Lucas Lin
24695d811a Merge "Broadcast ACTION_NETWORK_STATS_UPDATED in NetworkStatsHandler" am: 61fbce1bde am: 5ecaf8f36b am: 3f8ccb072e
Change-Id: I82a7e915c354b24600422a46aa8be427431e5d5e
2020-05-07 09:45:52 +00:00
Lucas Lin
3f8ccb072e Merge "Broadcast ACTION_NETWORK_STATS_UPDATED in NetworkStatsHandler" am: 61fbce1bde am: 5ecaf8f36b
Change-Id: I47f46d61c0cc9dacf24efc28ec900b35289eef5f
2020-05-07 09:37:17 +00:00
Lucas Lin
5ecaf8f36b Merge "Broadcast ACTION_NETWORK_STATS_UPDATED in NetworkStatsHandler" am: 61fbce1bde
Change-Id: I8996b46bbd71ddc27ef313e3d9d329faf56ac580
2020-05-07 09:21:25 +00:00
lucaslin
3648f0a35d Broadcast ACTION_NETWORK_STATS_UPDATED in NetworkStatsHandler
There is a corner case which may cause the deadlock:
When NetworkStatsService tried to broadcast the intent,
NetworkStatsService was waiting for a lock which was hold by
ActivityManagerService. In the same time, ActivityManagerService
was waiting for ActiveService#startServiceInnerLocked() to get a
lock which was hold by ConnectivityService. ConnectivityService
was waiting for a lock which was hold by BatteryStatsImpl.
BatteryStatsImpl was waiting for a lock which was hold by
NetworkStatsService, and the lock was locked by
NetworkStatsService when NetworkStatsService tried to broadcast
the intent.

To prevent deadlock when broadcasting the intent in
performPollLocked(), move the intent broadcasting from
performPollLocked() to NetworkStatsHandler.

Bug: 150418178
Bug: 155155473
Test: 1. Create the second user and see if the device will
         do factory reset or not.
      2. Factory reset manually and see if there is a deadlock.
Change-Id: Icf88d3e7a38562ab15187f6c71bc8fb0486d37c0
2020-05-07 08:49:39 +00:00
Treehugger Robot
ff3e6a21b9 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" am: f4a8f1f21e am: b4451fba20 -s ours am: a2de22278f -s ours am: f0dc778f22 -s ours am: 06ef0fb5e8 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 f0fcc339c3 is in history

Change-Id: I60293d6c82bad51cd37c3a50449cb30dbd101e4f
2020-05-05 12:43:12 +00:00
Treehugger Robot
06ef0fb5e8 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" am: f4a8f1f21e am: b4451fba20 -s ours am: a2de22278f -s ours am: f0dc778f22 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 f0fcc339c3 is in history

Change-Id: I61304a3c61ea7c76a3012a27f8a0964abd32cc0a
2020-05-05 12:22:50 +00:00
Treehugger Robot
f0dc778f22 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" am: f4a8f1f21e am: b4451fba20 -s ours am: a2de22278f -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 f0fcc339c3 is in history

Change-Id: Ia28361c12804065aa4e0729f3e6283a7f4049101
2020-05-05 12:07:17 +00:00
Treehugger Robot
a2de22278f [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" am: f4a8f1f21e am: b4451fba20 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 f0fcc339c3 is in history

Change-Id: I44a2ee47f6a88286b28d5165c67cfd4fdbdd0152
2020-05-05 11:54:36 +00:00
Treehugger Robot
b4451fba20 Merge "[SM10] Adopt helper class to monitor RAT type change per sub" am: f4a8f1f21e
Change-Id: Ifadf4ad62820c6cbf536a3984b1cf4a0b78cbc31
2020-05-05 11:32:31 +00:00
junyulai
53c97ec4cf [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 ab1eb887a6)
2020-05-05 18:37:29 +08:00
TreeHugger Robot
00f05ecb13 [automerger skipped] Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b -s ours am: eacbdf80e7 -s ours am: d20ea2e07e -s ours am: ac66ddcd6c -s ours
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 87ba308377 is in history

Change-Id: Iace5273476d2f5183a84b009d8f0c154cb6ca67d
2020-04-30 04:58:49 +00:00
TreeHugger Robot
ac66ddcd6c [automerger skipped] Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b -s ours am: eacbdf80e7 -s ours am: d20ea2e07e -s ours
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 87ba308377 is in history

Change-Id: I60a7c6b86c43ae1e57e98f2a6831289854b77274
2020-04-30 04:49:06 +00:00
TreeHugger Robot
d20ea2e07e [automerger skipped] Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b -s ours am: eacbdf80e7 -s ours
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 87ba308377 is in history

Change-Id: I4fe424305ea9af7c41033bd6cb7f52ef8f30c37a
2020-04-30 04:35:04 +00:00
TreeHugger Robot
eacbdf80e7 [automerger skipped] Merge "Filter debug entries for each vpn" into rvc-dev am: 1913e1d29b -s ours
am skip reason: Change-Id I3525edc385b07858b48c7add2d331c4b5a2e84ad with SHA-1 87ba308377 is in history

Change-Id: I89ff9147f99b03c5bd1e7f5aa34c5968cfbfc18e
2020-04-30 04:20:28 +00:00
Chiachang Wang
abfadbefef Filter debug entries for each vpn
NetworkStats calculation needs to filter out debug entries to
prevent over counting. While NetworkStatsFactory migrates data
usage over a VPN to the TUN network, NetworkStatsFactory does
not filter out debug entries per vpn which will cause debug
entries left and cause exception.

Bug: 152678151
Test: atest com.android.server.net.NetworkStatsFactoryTest
      and verify no exception
Change-Id: I3525edc385b07858b48c7add2d331c4b5a2e84ad
Merged-In: I3525edc385b07858b48c7add2d331c4b5a2e84ad
2020-04-30 02:39:15 +00:00
Chiachang Wang
35004c08de Merge changes I3525edc3,I6e18915e am: c861b10841 am: fa9d473f26 am: c16df4f73f am: 889f60b069 am: 992128136d
Change-Id: Ibe3182636251cb16c42e93bf886de01908de8fb9
2020-04-29 10:12:42 +00:00
Chiachang Wang
992128136d Merge changes I3525edc3,I6e18915e am: c861b10841 am: fa9d473f26 am: c16df4f73f am: 889f60b069
Change-Id: I1c2352574ce92f2f030a01394ec4d35860053e73
2020-04-29 09:56:55 +00:00
Chiachang Wang
889f60b069 Merge changes I3525edc3,I6e18915e am: c861b10841 am: fa9d473f26 am: c16df4f73f
Change-Id: Iff7435b20b830357a53f4773b211cd5ddc911ebd
2020-04-29 09:42:14 +00:00
Chiachang Wang
c16df4f73f Merge changes I3525edc3,I6e18915e am: c861b10841 am: fa9d473f26
Change-Id: I85b8798fc82873d22c338937bb61092fbde259e6
2020-04-29 09:24:10 +00:00
Chiachang Wang
fa9d473f26 Merge changes I3525edc3,I6e18915e am: c861b10841
Change-Id: Ie298cd37fdaa8d638298e8326c6f1db7a5d5b7b4
2020-04-29 09:08:45 +00:00
Chiachang Wang
87ba308377 Filter debug entries for each vpn
NetworkStats calculation needs to filter out debug entries to
prevent over counting. While NetworkStatsFactory migrates data
usage over a VPN to the TUN network, NetworkStatsFactory does
not filter out debug entries per vpn which will cause debug
entries left and cause exception.

Bug: 152678151
Test: atest com.android.server.net.NetworkStatsFactoryTest
      and verify no exception
Change-Id: I3525edc385b07858b48c7add2d331c4b5a2e84ad
2020-04-29 15:07:45 +08:00
TreeHugger Robot
83ffb61136 Merge "Enforce permission check in getUidStats function" into rvc-dev am: 0f3164c79d am: 913f69a8c2 am: 59eb818d1f am: 97314fbfa3
Change-Id: I80290c7d76cbd21ab53135d1d8ba846496a3cccf
2020-04-28 10:46:11 +00:00
TreeHugger Robot
19eb30a703 Merge "Enforce permission check in getUidStats function" into rvc-dev am: 0f3164c79d am: 2fe55ed6d4 am: 6069c195d5 am: 5c47b3410c
Change-Id: Ib264aa6768baf3c4780d8ffc397b0bcf2ad3e159
2020-04-28 10:45:07 +00:00
TreeHugger Robot
97314fbfa3 Merge "Enforce permission check in getUidStats function" into rvc-dev am: 0f3164c79d am: 913f69a8c2 am: 59eb818d1f
Change-Id: I55ca129e199acf824c027fa7ec11d8b36037f44d
2020-04-28 10:27:16 +00:00
TreeHugger Robot
5c47b3410c Merge "Enforce permission check in getUidStats function" into rvc-dev am: 0f3164c79d am: 2fe55ed6d4 am: 6069c195d5
Change-Id: Ic11de2c89388aad2323fde6f62f56fcbc39898f5
2020-04-28 10:26:34 +00:00
TreeHugger Robot
59eb818d1f Merge "Enforce permission check in getUidStats function" into rvc-dev am: 0f3164c79d am: 913f69a8c2
Change-Id: Icd74369c536e0504868ba7cbcb680bcc31e763d5
2020-04-28 09:54:32 +00:00
TreeHugger Robot
6069c195d5 Merge "Enforce permission check in getUidStats function" into rvc-dev am: 0f3164c79d am: 2fe55ed6d4
Change-Id: I99eb5b4bfe193a8415ff01ada0078fff634a200f
2020-04-28 09:53:59 +00:00
TreeHugger Robot
913f69a8c2 Merge "Enforce permission check in getUidStats function" into rvc-dev am: 0f3164c79d
Change-Id: I2b7c846497690bfca7b12ad70aa778c785c416a2
2020-04-28 09:30:09 +00:00
TreeHugger Robot
0f3164c79d Merge "Enforce permission check in getUidStats function" into rvc-dev 2020-04-28 09:13:32 +00:00
Chenbo Feng
d80a6ed9e2 Enforce permission check in getUidStats function
The NetworkStatsService.getUidStats() currently doesn't have any
permission check to make sure unpriviledged apps cannot read the stats
of a different uid. It will protentially have security problem since
apps with ACCESS_NETWORK_STATS permission can directly calling into
NetworkStatsService and bypass the check in TrafficStats. Move the uid
check from TrafficStats to NetworkStatsService to fix the problem.

Bug: 129151407
Test: atest AppSecurityTests#testAppFailAccessPrivateData_full
Test: atest AppSecurityTests#testAppFailAccessPrivateData_instant
Test: atest android.app.usage.cts.NetworkUsageStatsTest
Test: atest NetworkStatsBinderTest

Change-Id: Iae85676cfe5f114da69ec278afc2c904bc907234
2020-04-27 18:38:56 +08:00
Benedict Wong
61d5bb26dd Merge "Use TransformRecord to get SPI instead of SpiRecord" am: ba714fa495 am: ff540abc9f am: d9c923b26d am: 915542d8ad am: 912e50dabc
Change-Id: I01b210e1db69a625a9c208ee58528a95ef57744d
2020-04-25 00:12:07 +00:00
Benedict Wong
912e50dabc Merge "Use TransformRecord to get SPI instead of SpiRecord" am: ba714fa495 am: ff540abc9f am: d9c923b26d am: 915542d8ad
Change-Id: I7d39462903dce6ef0f68f73edfafdc6450464f36
2020-04-25 00:06:31 +00:00
Benedict Wong
915542d8ad Merge "Use TransformRecord to get SPI instead of SpiRecord" am: ba714fa495 am: ff540abc9f am: d9c923b26d
Change-Id: I2ffcf5466975d9a0f5491cf0dc4861afe28f9064
2020-04-24 23:49:59 +00:00
Benedict Wong
d9c923b26d Merge "Use TransformRecord to get SPI instead of SpiRecord" am: ba714fa495 am: ff540abc9f
Change-Id: Ibc3090627699aecb4ab5e183219b5848005d0412
2020-04-24 23:27:36 +00:00
Benedict Wong
ff540abc9f Merge "Use TransformRecord to get SPI instead of SpiRecord" am: ba714fa495
Change-Id: If9d23537009ea1359d7dc198ba4662c85f8f4b0c
2020-04-24 23:12:27 +00:00
Benedict Wong
ba714fa495 Merge "Use TransformRecord to get SPI instead of SpiRecord" 2020-04-24 22:32:41 +00:00
TreeHugger Robot
3530a40054 Merge "Narrow access to getDataLayerSnapshotForUid()." into rvc-dev am: fdbc50b386 am: 44603228fc am: b4152bb8ec am: ebe70af0f0
Change-Id: I78edacf6d93ec54af7cf60b654563dec2106a574
2020-04-18 02:49:44 +00:00
TreeHugger Robot
ebe70af0f0 Merge "Narrow access to getDataLayerSnapshotForUid()." into rvc-dev am: fdbc50b386 am: 44603228fc am: b4152bb8ec
Change-Id: Id9bda982d4b26e116b047984c3a8fbe602e238d1
2020-04-18 02:22:38 +00:00
TreeHugger Robot
b4152bb8ec Merge "Narrow access to getDataLayerSnapshotForUid()." into rvc-dev am: fdbc50b386 am: 44603228fc
Change-Id: I1540de76779d8d70d56ef3c1e8ad46f164a743d9
2020-04-18 02:02:16 +00:00
TreeHugger Robot
44603228fc Merge "Narrow access to getDataLayerSnapshotForUid()." into rvc-dev am: fdbc50b386
Change-Id: Id800ea9c8fd9462c362afc35fde5ab06c5615696
2020-04-18 01:07:02 +00:00
TreeHugger Robot
fdbc50b386 Merge "Narrow access to getDataLayerSnapshotForUid()." into rvc-dev 2020-04-18 00:42:17 +00:00
Junyu Lai
7afdfd49c4 [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: 1693b22869 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 f0fcc339c3 is in history

Change-Id: I286546740d259790e5153d8e9c565762fd46dda1
2020-04-16 00:18:43 +00:00
Junyu Lai
cc3abd2ef4 [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: 4736aa3be2 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 f0fcc339c3 is in history

Change-Id: I65040c118cde06339e9b221c557b314d205aa60e
2020-04-16 00:07:07 +00:00
Junyu Lai
50c4a1ab55 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: cdd7c94ec0 am: 5f8004030c am: edd5229bb5 am: b3e4446eb3 am: 97f3556501 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 ab1eb887a6 is in history

Change-Id: I019d6fa102815a24711aea617a51aca2364b6a6d
2020-04-15 23:54:55 +00:00
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