Commit Graph

5400 Commits

Author SHA1 Message Date
Benedict Wong
94e1c08a9a Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: 7e2fe6eeee am: 331c924374 am: bc03521467 am: c2542125db am: bd109853d9
Change-Id: I60426f87a51f46bbcddf6da911a8df0db03fc0f8
2020-04-28 19:26:15 +00:00
Benedict Wong
bc03521467 Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: 7e2fe6eeee am: 331c924374
Change-Id: I7ef93d318b795754eea3511caf7c3ae9187a88b2
2020-04-28 18:17:10 +00:00
Benedict Wong
331c924374 Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: 7e2fe6eeee
Change-Id: Ib3e7bea4ad17eaf0b64bc157ed682c672a17f79a
2020-04-28 17:59:07 +00:00
Benedict Wong
7e2fe6eeee Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" 2020-04-28 17:33:46 +00:00
TreeHugger Robot
d3df7540ff Merge "Enforce permission check in getUidStats function" into rvc-dev am: f6288ea881 am: 2fe55ed6d4 am: 6fca71ec1a am: 711f841dfd
Change-Id: Ib264aa6768baf3c4780d8ffc397b0bcf2ad3e159
2020-04-28 10:45:07 +00:00
TreeHugger Robot
6fca71ec1a Merge "Enforce permission check in getUidStats function" into rvc-dev am: f6288ea881 am: 2fe55ed6d4
Change-Id: I99eb5b4bfe193a8415ff01ada0078fff634a200f
2020-04-28 09:53:59 +00:00
TreeHugger Robot
8a68fd2e70 Merge "Enforce permission check in getUidStats function" into rvc-dev am: f6288ea881
Change-Id: I2b7c846497690bfca7b12ad70aa778c785c416a2
2020-04-28 09:30:09 +00:00
TreeHugger Robot
f6288ea881 Merge "Enforce permission check in getUidStats function" into rvc-dev 2020-04-28 09:13:32 +00:00
Chenbo Feng
78cd384e86 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
Philip P. Moltmann
e777a902f2 Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: da8697a48b am: c5299c7c3a
Change-Id: I099944752fc3006c1e98750dd46dbebf5e50789f
2020-04-22 15:19:14 +00:00
Philip P. Moltmann
c5299c7c3a Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: da8697a48b
Change-Id: I3ddd8954cf8443f549f7965cc43f2600bf92a80b
2020-04-22 15:09:28 +00:00
Philip P. Moltmann
fbc913c2ac Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" 2020-04-22 14:57:49 +00:00
Jeff Sharkey
ea636fd945 Merge changes from topic "apr19" into rvc-dev am: b67e70aa40 am: ed91f7aabf am: a650421e92 am: a719ff7c61
Change-Id: I315e0b8f3a4309298951fed20c5a706f4707fd6a
2020-04-21 23:33:54 +00:00
Jeff Sharkey
a650421e92 Merge changes from topic "apr19" into rvc-dev am: b67e70aa40 am: ed91f7aabf
Change-Id: I9713e76a78868c7ef2e57c697e141643e1681a81
2020-04-21 23:12:09 +00:00
Jeff Sharkey
eb80b15511 Merge changes from topic "apr19" into rvc-dev am: b67e70aa40
Change-Id: Ic5abb1e4e727a6d7869dcb7a46cee64d225c4c61
2020-04-21 23:01:53 +00:00
Jeff Sharkey
0223df096c Update some Parcelables to send Strings UTF-8.
An earlier CL with benchmarks has shown that sending strings as UTF-8
is 50% faster for US-ASCII strings, and still 68% faster for complex
strings referencing higher Unicode planes.  (So an improvement in
both cases!)

Since code across the OS still makes heavy assumptions about Parcel
strings typically being UTF-16, we need to carefully migrate
Parcelables by hand, which is what this CLs begins doing.

This is a purely mechanical refactoring with no functional changes.

Bug: 154436100
Test: manual
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: Ia9e581efd7c40269342b7528ca07363deb843c0f
2020-04-21 22:59:26 +00:00
Philip P. Moltmann
01628ba180 Set attributionTag for noteOp(WRITE_SETTINGS) calls
Test: atest FrameworksNetTests
Bug: 136595429
Change-Id: I33f787644c44d7b0e5ce17a433820cfcd985cdfb
Exempt-From-Owner-Approval: Merge from AOSP
2020-04-21 21:46:34 +00:00
Philip P. Moltmann
6bb9c7bdc4 Set attributionTag for noteOp(WRITE_SETTINGS) calls
Test: atest FrameworksNetTests TetheringTests:TetheringServiceTest
Bug: 136595429
Merged-In: I33f787644c44d7b0e5ce17a433820cfcd985cdfb
Change-Id: Ic3d937e7bb5141798234ed5b2852c1f768e97495
2020-04-20 18:00:03 -07:00
Jeff Sharkey
8ef2fb1f37 Merge "Fix logic inversion bug from Android 1.0." into rvc-dev am: 672582e4e1 am: 148cc1ae5e am: 1c75cbb914 am: 57afc34bb8 am: 9cb9725ff8
Change-Id: I2bfd15a4733c34cebe47cce0dd47a863d474497d
2020-04-15 23:58:36 +00:00
Jeff Sharkey
9cb9725ff8 Merge "Fix logic inversion bug from Android 1.0." into rvc-dev am: 672582e4e1 am: 148cc1ae5e am: 1c75cbb914 am: 57afc34bb8
Change-Id: Ida79f04438ac1ee0bd1da9ad760b56ef8253d5f5
2020-04-15 18:51:25 +00:00
Jeff Sharkey
58ec9ae4f4 Merge "Fix logic inversion bug from Android 1.0." into rvc-dev am: 672582e4e1 am: 148cc1ae5e
Change-Id: I4b62b045cc629ca02737b3b0bcf50a07f7e4c30c
2020-04-15 17:50:22 +00:00
Jeff Sharkey
6998bb53de Merge "Fix logic inversion bug from Android 1.0." into rvc-dev am: 672582e4e1
Change-Id: If2a85a7e4a71899b5582f6aba59d09cb1bdb88a6
2020-04-15 17:40:17 +00:00
Jeff Sharkey
672582e4e1 Merge "Fix logic inversion bug from Android 1.0." into rvc-dev 2020-04-15 13:54:37 +00:00
Benedict Wong
2ed005834f Add filtering for IPsec algorithms in IKEv2 VPNs
This commit adds support for validating and filtering IPsec algorithms.
Without a public API exposing IKEv2 algorithms (and their respective
public APIs), the allowedAlgorithms can only filter the proposals for
IPsec (Child) SA algorithms.

Additionally, this removes the HMAC_SHA1 from the IKE SA's integrity
algorithm proposals due to insecurity

Bug: 153701879
Test: FrameworksNetTests passing, new tests added
Change-Id: I7e61a1612692db275b751330af5bacbf86836a8c
2020-04-14 18:07:36 -07:00
Chalard Jean
b0bf3e94fa Merge "Add instrumentation to test NetworkAgent." into rvc-dev 2020-04-14 04:54:33 +00:00
Chalard Jean
3b2a81b23b Allow testing of signal strength
- Let any process with NETWORK_SETTINGS register for signal strength
  wakeup.
- Allow agents registering test networks to assign them a signal
  strength.

Test: NetworkAgentTest
Bug: 139268426
Change-Id: Iebfeb9316bcbd8472459c517abb16f1f9d879871
Merged-In: I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21
(cherry picked from commit 5cc7b18fe7, aosp/1284585)
2020-04-14 01:22:14 +00:00
Chalard Jean
0348de6615 Add instrumentation to test NetworkAgent.
Test: NetworkAgentTest, new tests using this API
Bug: 139268426
Change-Id: I0b65be788bb742fd1a8c0ca624e97368462f9b6a
Merged-In: Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5
(cherry picked from commit d89dcb9765, aosp/1284574)
2020-04-14 01:20:16 +00:00
Nick Cook
9033255b96 Docs: fix code formatting.
Test: m ds-docs-java
Bug: 149067564

Change-Id: I1900fac17d1dffca2277d6e6d5a510507aa1bc27
2020-04-14 01:06:31 +00:00
Chalard Jean
1b3fb5fff6 Merge "Allow testing of signal strength" am: 2f46cd181a am: 2e2b52d5d8
Change-Id: Ib00611c70d9b8fc3e4ee5338980344f5e2167fa1
2020-04-13 17:50:19 +00:00
Chalard Jean
2e2b52d5d8 Merge "Allow testing of signal strength" am: 2f46cd181a
Change-Id: I2300fe5c9be8a781fea67358c5e1774872b29f7c
2020-04-13 17:32:30 +00:00
Chalard Jean
46092d9775 Merge "Add instrumentation to test NetworkAgent." am: 40517308f2 am: 833b0bcbf5
Change-Id: Ief4f6bd95ba513e08c5d2e9e8fef9d0c426b4478
2020-04-13 15:22:45 +00:00
Chalard Jean
833b0bcbf5 Merge "Add instrumentation to test NetworkAgent." am: 40517308f2
Change-Id: I799ad6fa5d6f1bf522414081bac75c952ad2baf7
2020-04-13 15:05:03 +00:00
Chalard Jean
ca241694cb Allow testing of signal strength
- Let any process with NETWORK_SETTINGS register for signal strength
  wakeup.
- Allow agents registering test networks to assign them a signal
  strength.

Test: NetworkAgentTest
Bug: 139268426
Change-Id: I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21
2020-04-13 21:55:32 +09:00
Chalard Jean
eea3b016ce Add instrumentation to test NetworkAgent.
Test: NetworkAgentTest, new tests using this API
Bug: 139268426
Change-Id: Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5
2020-04-13 15:44:07 +09:00
Treehugger Robot
67ac7abd21 Fix a theoretical NPE
Test: NetworkAgentTests
Bug: 153718627

Change-Id: I955b6dac6de48b12696dc640f131f5983ac552df
Merged-In: I08f57cce0cd85d5cd66e9a0ef948224290e9200e
(cherry picked from commit 31492c7087, aosp/1284575)
2020-04-11 03:26:27 +00:00
Xin Li
f68e6a03f1 Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master 2020-04-10 18:42:15 +00:00
Jeff Sharkey
c6f5e98807 Fix logic inversion bug from Android 1.0.
Bug: 73822755
Test: atest CtsNetTestCases:android.net.cts.UrlQuerySanitizerTest
Change-Id: I52e8ec79bd8e9e39e06b3ff35c6312d91f4eacd0
2020-04-10 11:34:57 -06:00
Treehugger Robot
df0ee25d57 Merge "Fix a theoretical NPE" am: c312053b39 am: 668661d94c
Change-Id: Ibf814e81ca984b47b9be1e423e2cde908cf7f193
2020-04-10 17:08:04 +00:00
Treehugger Robot
c312053b39 Merge "Fix a theoretical NPE" 2020-04-10 16:25:07 +00:00
Chalard Jean
3854ed0c53 Fix a theoretical NPE
Test: NetworkAgentTests
Bug: 153718627
Change-Id: I08f57cce0cd85d5cd66e9a0ef948224290e9200e
2020-04-10 23:08:00 +09:00
Xin Li
1aaf25f338 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master
Bug: 151763422
Change-Id: Ib0e04b2f16105fad6be0165974ad41d3f5b26882
2020-04-09 18:41:51 -07:00
Cody Kesting
b840c602ed Fix typo in VpnManager Docs.
Bug: 153364039
Test: n/a. Docs change only.
Change-Id: I8259bfc09735515f428bb41d69fedd3ea1961f79
Merged-In: I8259bfc09735515f428bb41d69fedd3ea1961f79
(cherry picked from commit 3150b04b67)
2020-04-10 00:30:38 +00:00
Cody Kesting
bfa6da0970 Merge "Fix typo in VpnManager Docs." am: 138575a48c am: 245ef6bdf9
Change-Id: If72bc191faad9e5024e8d2200aceed88803ef102
2020-04-09 22:10:32 +00:00
Cody Kesting
138575a48c Merge "Fix typo in VpnManager Docs." 2020-04-09 21:12:23 +00:00
Treehugger Robot
b2f183cd6e Fix a stupid NPE
Okay so this is really not a behavior change as it converts an
NPE into an illegal argument exception, but still, that's what
should happen (and that's what the upcoming test actually tests
for).

Test: upcoming NetworkAgentTest
Bug: 139268426
Change-Id: I0d9b8cb8f8dcb587b9430b486b863efb9e9e77ef
Merged-In: I3e17211c03bc74426bf5e2e414ec322d73b0060b
(cherry picked from commit 827d7ceea1, aosp/1277595)
2020-04-07 07:29:10 +00:00
Treehugger Robot
3e33a9cb60 Merge "Fix a stupid NPE" am: 72746119bc am: 77ccd8d055
Change-Id: Ic3b10be1bec50271470dfedfa8cb7f8e5ab8f821
2020-04-07 06:19:00 +00:00
Treehugger Robot
2d9fd741ed Merge "Fix a stupid NPE" am: 72746119bc am: 77ccd8d055
Change-Id: I68e5702008a82d93c634fd45c2bd83a33fdf0cd2
2020-04-07 06:18:28 +00:00
Treehugger Robot
72746119bc Merge "Fix a stupid NPE" 2020-04-07 05:53:10 +00:00
Cody Kesting
87f0bc2e1a Fix typo in VpnManager Docs.
Bug: 153364039
Test: n/a. Docs change only.
Change-Id: I8259bfc09735515f428bb41d69fedd3ea1961f79
2020-04-06 12:57:58 -07:00
Chalard Jean
ee171cad08 Fix a bug where the legacy extra info is reset on connect.
Bug: 149459996
Test: NetworkAgentTest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests

Change-Id: I3e437f0fe2eb28f1d621551a8daf164a06af83fc
Merged-In: I3e437f0fe2eb28f1d621551a8daf164a06af83fc
(cherry picked from commit a3fdb94a32, originally aosp/1277602)
2020-04-06 11:14:59 +00:00