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

2704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiachang Wang
fa9d473f26 Merge changes I3525edc3,I6e18915e am: c861b10841 
Change-Id: Ie298cd37fdaa8d638298e8326c6f1db7a5d5b7b4
 2020-04-29 09:08:45 +00:00
android-build-team Robot
f12ae56815 Snap for 6441286 from 014b5e780901cd622855bb889ebd423d6efeeb7f to mainline-release 
Change-Id: I7d17005e20e06ea6b6f497952d8fab33c45e1bcc
 2020-04-29 07:09:39 +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
android-build-team Robot
2e3e72d638 Snap for 6440900 from 144788b5bb46b8ef52e9cd53b4d50e558e3d52e7 to rvc-release 
Change-Id: I70cfc31e85c8497a91825a099852573d42aff086
 2020-04-29 01:14:26 +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
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
android-build-team Robot
5036472f72 Snap for 6410067 from 23b52c4f47eced4dca86093f5c48419bef3103f5 to mainline-release 
Change-Id: Ic8cf0fcd7ffdfd54385982bb890d0ebd3c485181
 2020-04-20 07:15:41 +00:00
android-build-team Robot
704eca30df Snap for 6408188 from ff9701f94856b114a1e74e3bb6591c1e18413763 to rvc-release 
Change-Id: I0eb357db7408b3e7596c74efa9d4bd4d3b09486c
 2020-04-18 23:15:12 +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
android-build-team Robot
3f84f5d9d7 Snap for 6399349 from d1f82dd3d84c78f230177d0c8935f03b6e7df3dc to mainline-release 
Change-Id: Iab1e25b6719b5aeec2027b7e86413e42fc65ce9e
 2020-04-16 07:12:34 +00:00
android-build-team Robot
1be2fb4bdc Snap for 6398428 from bcb2d73e48ca3d4b1c14b85b055ba20103211896 to rvc-release 
Change-Id: I0b5a894f5adc4f7fa731ce128432391d01cbe556
 2020-04-16 01:02:25 +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
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