Commit Graph

2344 Commits

Author SHA1 Message Date
Automerger Merge Worker
d41955f113 Merge "Fix typo in aosp/1242602" am: 1ae5516429 am: 934bb9fa9c am: 7730f7fe95
Change-Id: I7c1cbdb05cf0d8a8866b06ac5e25ffd6e06f06cd
2020-03-16 09:04:25 +00:00
Automerger Merge Worker
7730f7fe95 Merge "Fix typo in aosp/1242602" am: 1ae5516429 am: 934bb9fa9c
Change-Id: I3f1078dd2ea942860e43d5421fa44e438c9de21d
2020-03-16 08:52:50 +00:00
Automerger Merge Worker
e681bebdf8 Merge "Fix typo in aosp/1242602" am: 1ae5516429 am: 934bb9fa9c
Change-Id: Icd65f665812d14f23671be65d1d182d2a78ecf2f
2020-03-16 08:52:39 +00:00
Automerger Merge Worker
934bb9fa9c Merge "Fix typo in aosp/1242602" am: 1ae5516429
Change-Id: Ie617874be311e84e04d889f6c2069c77c25150b7
2020-03-16 08:36:03 +00:00
junyulai
9d4e21f0be Fix typo in aosp/1242602
Test: m -j
Bug: 149652079
Change-Id: Ie023c8371785fc239c54eacbf056141c2e9e3444
2020-03-16 15:00:24 +08:00
junyulai
e7c6c25653 [SP24] Rename functions that add Entry unconditionally
Currently, in NetworkStats, there are many methods to manipulate
the records. However, some methods are similar and ambiguous,
such as addEntry, addValues, setValues, addIfaceValues,
combineValues and combineAllValues.

Thus, properly grouping and renaming methods are necessary.
In this change, for methods that add one record unconditionally,
name them insertEntry.
  setIfaceValues -> insertEntry
  addEntry -> insertEntry

Test: atest FrameworksNetTests ImsPhoneCallTrackerTest TetheringTests
Test: m doc-comment-check-docs
Bug: 148895143
Change-Id: I801ddc49e283a254b9586700c9b597c0adb0d459
2020-03-16 14:27:45 +08:00
junyulai
c7e8100faa [SP23] Address misc API review comment about NetworkStats
This change add several javadoc for NetworkStats and its Entry
class. Also remove IFACE_ALL constant accordlingly.

Test: atest FrameworkNetTests
Test: m doc-comment-check-docs
Bug: 148895143
Change-Id: Id1b8f41be79f847ad73197ff0e18258b6ee8a730
2020-03-16 14:27:45 +08:00
Automerger Merge Worker
a8d3800dce [SP21] Address comments for API council review about aosp/1172143 am: 9a4eeaea2f am: 759155a3a3 am: 759f420024
Change-Id: I9c44371665dc09612357a5ef880364bc32824784
2020-03-16 03:39:03 +00:00
Automerger Merge Worker
759f420024 [SP21] Address comments for API council review about aosp/1172143 am: 9a4eeaea2f am: 759155a3a3
Change-Id: I86cf3b57722f64c0989ce606fde71d6173f812bb
2020-03-16 03:14:01 +00:00
Automerger Merge Worker
610e81320d [SP21] Address comments for API council review about aosp/1172143 am: 9a4eeaea2f am: 759155a3a3
Change-Id: Ia5e64eb524a852539850f46df87a6b28d4910cbc
2020-03-16 03:13:45 +00:00
Automerger Merge Worker
759155a3a3 [SP21] Address comments for API council review about aosp/1172143 am: 9a4eeaea2f
Change-Id: I8634d6f6ed65ec6b10009a90b147881fe1fc4530
2020-03-16 03:03:51 +00:00
junyulai
9a4eeaea2f [SP21] Address comments for API council review about aosp/1172143
Test: atest FrameworksNetTests ImsPhoneCallTrackerTest
Test: atest TetheringTests NetworkStackTests
Test: m doc-comment-check-docs
Fix: 148552904

Change-Id: I141393f229e772d2eb9f7c156849e379bd71b845
2020-03-12 21:34:17 +08:00
Automerger Merge Worker
052c020ebe Merge changes from topic "sp20-stats-provider-permission" am: 51bbefacf2 am: bf292288b6 am: 386e5150d4
Change-Id: I871191f97745bc5535f906cda4726ab57292aeac
2020-03-12 09:06:05 +00:00
Automerger Merge Worker
a1f0f0ccf3 Add permission check functions to NetworkStatsService am: df2aef7c1d am: ba550c1836 am: 3fd000536c
Change-Id: Iccd3c7a6dc15370460ece475e0655ef993f4577c
2020-03-12 09:06:03 +00:00
Automerger Merge Worker
386e5150d4 Merge changes from topic "sp20-stats-provider-permission" am: 51bbefacf2 am: bf292288b6
Change-Id: Ifb7237d5cfaeed416ad1efb4f0c295fe846ab3b0
2020-03-12 09:00:33 +00:00
Automerger Merge Worker
3fd000536c Add permission check functions to NetworkStatsService am: df2aef7c1d am: ba550c1836
Change-Id: I6aa0be382bb273cc8cdf2308f737ad047463b870
2020-03-12 09:00:23 +00:00
Automerger Merge Worker
7de3ff8eda Merge changes from topic "sp20-stats-provider-permission" am: 51bbefacf2 am: bf292288b6
Change-Id: I765831bcb6059fa95cf59967becde4b9340cde39
2020-03-12 09:00:20 +00:00
Automerger Merge Worker
f43cef4969 Add permission check functions to NetworkStatsService am: df2aef7c1d am: ba550c1836
Change-Id: Ibd1d64edd72887961ee76a71df9c9b71c9727967
2020-03-12 09:00:17 +00:00
Automerger Merge Worker
bf292288b6 Merge changes from topic "sp20-stats-provider-permission" am: 51bbefacf2
Change-Id: I6111589d27501684b4c43711448a1fa08221a3f5
2020-03-12 08:39:54 +00:00
Automerger Merge Worker
ba550c1836 Add permission check functions to NetworkStatsService am: df2aef7c1d
Change-Id: Id2df1c6d5a5dc77f59f68772f5b46659fb956bc2
2020-03-12 08:39:48 +00:00
Junyu Lai
51bbefacf2 Merge changes from topic "sp20-stats-provider-permission"
* changes:
  [SP20] Check signature permission when accessing network stats provider
  Add permission check functions to NetworkStatsService
2020-03-12 08:19:24 +00:00
Automerger Merge Worker
0c7f62f729 [automerger skipped] Merge "Merge NetworkStatsService handler changes." into rvc-dev am: 48aff64f9b -s ours am: ccabfd0af6 -s ours
am skip reason: Change-Id If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7 with SHA-1 1ff5f65f5b is in history

Change-Id: I9d5b81e4cd85c56db1143c508fe4da314d29d178
2020-03-11 06:55:14 +00:00
Automerger Merge Worker
82a2aa2a0d [automerger skipped] Merge "Merge NetworkStatsService handler changes." into rvc-dev am: 48aff64f9b am: c0864b8ce4 -s ours
am skip reason: Change-Id If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7 with SHA-1 1ff5f65f5b is in history

Change-Id: Ie664fbef5d0e7b6754c400ff73c5a78485ee4a63
2020-03-11 06:55:07 +00:00
Automerger Merge Worker
ccabfd0af6 [automerger skipped] Merge "Merge NetworkStatsService handler changes." into rvc-dev am: 48aff64f9b -s ours
am skip reason: Change-Id If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7 with SHA-1 1ff5f65f5b is in history

Change-Id: Ie58da93cd3a7876d8dc56bbcff90bcfd0a38c9d3
2020-03-11 06:36:38 +00:00
Lorenzo Colitti
48aff64f9b Merge "Merge NetworkStatsService handler changes." into rvc-dev 2020-03-11 06:19:18 +00:00
Benedict Wong
529e8aae25 Automatically set IPsec tunnel interface as up
This change makes IPsec tunnel interfaces automatically get brought up
once they are created. Originally this was considered to be an
additional safety check, as they would not be start routing traffic
until explicitly brought up. However, in the intervening time, the
NetworkManagementController now requires the NETWORK_STACK permission to
set an interface as up. Additionally, that call is a hidden API, and
thus not usable for use cases such as IWLAN.

Bug: 149348618
Test: FrameworksNetTests, CtsNetTestCases passing.
Change-Id: I55b63a748463a388e1e2991d2d5d6b3023545e60
2020-03-10 23:08:16 -07:00
Benedict Wong
7bcf9c28ac Relax IPsec resource count restrictions.
IPsec resource counts were selected to be conservative, due to unknowns
about device capabilities. Since then, it appears that we no longer need
such stringent quotas, and this can be relaxed.

Test: FrameworksNetTest passing
Change-Id: Id53d14e5698e5fcc410868424176b00350c7ae79
2020-03-10 23:08:13 -07:00
Automerger Merge Worker
9a56a837de [automerger skipped] Merge "Add missing RequiresPermission to EthernetManager" into rvc-dev am: ad553fb634 -s ours
am skip reason: Change-Id I2af74cbcfa642f05f5e7bf85b2a8e8c38595f6ca with SHA-1 11f3924f18 is in history

Change-Id: Idaaaa1dbbad6e616a852253e1ace463385b3b24e
2020-03-10 02:00:40 +00:00
Automerger Merge Worker
3bc71e0d89 Add missing RequiresPermission to EthernetManager
The method requires NETWORK_STACK or MAINLINE_NETWORK_STACK permissions,
but the annotation was missing.

Test: m
Fixes: 150877670
Merged-In: I2af74cbcfa642f05f5e7bf85b2a8e8c38595f6ca
(cherry picked from commit e45d3ff849695977cb063cc59550c505b220bd6c)

Change-Id: Ia215b74df99ae60be2e380917be68a272d658ef4
2020-03-09 10:20:22 +00:00
Automerger Merge Worker
7400d9c846 Merge "Add missing RequiresPermission to EthernetManager" am: b3d7fe48ad am: 360c24f950
Change-Id: I82aa6c27748dab5835158f4a64c3d8efbc8e28b4
2020-03-09 08:24:38 +00:00
Automerger Merge Worker
ff5fdffdad Merge "Add missing RequiresPermission to EthernetManager" am: b3d7fe48ad am: 360c24f950
Change-Id: I03ba43bc3368241e260dbda25282af1fbef84260
2020-03-09 08:24:26 +00:00
Automerger Merge Worker
43759b76c3 [automerger skipped] Merge "Fix crash and duplicated ethernet tethering request" into rvc-dev am: 02ee003aa5 -s ours
am skip reason: Change-Id I7c5127e96d80d077735010d2e62c7227805ccb10 with SHA-1 c8e7d759be is in history

Change-Id: I8c338aedd21b50b412d600d165c1d0f63453d52a
2020-03-09 08:20:47 +00:00
Automerger Merge Worker
c0565de11f Merge NetworkStatsService handler changes.
=====
Remove the need of accessing handler in NSS unit test

Currently, to wait for handler becomes idle, specific message
is used and the test would wait for condition variable to be
open when the message is processed.

However, this is already done in the HandlerUtils. Thus,
there is no need to post such message manually in the handler.

Test: atest FrameworksNetTests
Bug: 150664039

Change-Id: Iab32b2dbab01634ca159dcb90fc9f929d1fed1a2
=====
Remove setHandler in NetworkStatsService

Currently, internal handler is set by setHandler after
constructing NSS object. This was introduced in ag/866187 to
access the handler in the unit test.

However, the design put NSS in a bad situation where all classes
that need handler or executor could not be final and need to be
dynamically allocated in order to get a valid handler.

Thus, since the usage of handler is removed in previous patch,
this change eliminate setHandler by initializing the handler in
the constructor.

Test: atest FrameworksNetTests
Bug: 150664039

Change-Id: I794a24d00b0ca9fdc78091e7b9ab7307e0f034b7
=====

Bug: 150664039
Change-Id: If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7
Merged-In: If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7
(cherry picked from commit 2a6439d7e2a3926e10a0b9a4dc730b1a022d8138)
2020-03-09 07:59:27 +00:00
Remi NGUYEN VAN
11f3924f18 Add missing RequiresPermission to EthernetManager
The method requires NETWORK_STACK or MAINLINE_NETWORK_STACK permissions,
but the annotation was missing.

Test: m
Fixes: 150877670
Change-Id: I2af74cbcfa642f05f5e7bf85b2a8e8c38595f6ca
2020-03-09 14:18:55 +09:00
Automerger Merge Worker
87aa2869fe Fix crash and duplicated ethernet tethering request
This change fix two things:
1. Handle ethernet callback in internal thread to avoid crash. IpServer
should be created from tethering thread, otherwise mIpNeighborMonitor of
IpServer would throw
   IllegalStateException("start() called from off-thread")
2. Ethernet tethering request may be duplicated if multiple
startTethering is called but no stopTethering

Bug: 130840861
Bug: 148824036
Test: ON/OFF ethernet tehtering manually
      atest TetheringTests

Change-Id: Ibd3ea6bc6751bd65647ff381f9b0124bc3395c09
Merged-In: I7c5127e96d80d077735010d2e62c7227805ccb10
Merged-In: Ibd3ea6bc6751bd65647ff381f9b0124bc3395c09
(cherry picked from commit 72702b979654234c18045f04270040056a74cf90)
2020-03-09 02:02:23 +00:00
Automerger Merge Worker
8297518d54 Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: d11ef42169 am: f01b99332b
Change-Id: I3bc4f4e9dbe6e735c154338ab641b56e7c6ad027
2020-03-06 00:27:49 +00:00
Automerger Merge Worker
93e1e0c625 [automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: d11ef42169 am: f01b99332b -s ours
am skip reason: subject contains skip directive

Change-Id: I25e889bad69a7a3bfd819e7a75a69a16f29b92da
2020-03-06 00:26:36 +00:00
Bill Yi
d11ef42169 Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" 2020-03-05 18:27:30 +00:00
Automerger Merge Worker
1ff5f65f5b Merge changes I794a24d0,Iab32b2db am: f46d3aa4bb am: ae7c0fddb7
Change-Id: If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7
2020-03-04 13:36:11 +00:00
Automerger Merge Worker
74dcd87484 Merge changes I794a24d0,Iab32b2db am: f46d3aa4bb am: ae7c0fddb7
Change-Id: Ifb63c3d26c9da15b1074a6bd2e00f678f132122a
2020-03-04 13:36:09 +00:00
Automerger Merge Worker
ae7c0fddb7 Merge changes I794a24d0,Iab32b2db am: f46d3aa4bb
Change-Id: I03f6b9e521793b92f83a21583a2e53fb1d31fba1
2020-03-04 13:26:51 +00:00
Junyu Lai
f46d3aa4bb Merge changes I794a24d0,Iab32b2db
* changes:
  Remove setHandler in NetworkStatsService
  Remove the need of accessing handler in NSS unit test
2020-03-04 13:07:49 +00:00
junyulai
2999462561 Remove setHandler in NetworkStatsService
Currently, internal handler is set by setHandler after
constructing NSS object. This was introduced in ag/866187 to
access the handler in the unit test.

However, the design put NSS in a bad situation where all classes
that need handler or executor could not be final and need to be
dynamically allocated in order to get a valid handler.

Thus, since the usage of handler is removed in previous patch,
this change eliminate setHandler by initializing the handler in
the constructor.

Test: atest FrameworksNetTests
Bug: 150664039

Change-Id: I794a24d00b0ca9fdc78091e7b9ab7307e0f034b7
2020-03-04 16:01:21 +08:00
Automerger Merge Worker
bf873f5ea0 Merge "Move DnsSdTxtRecord to net common static library" am: 8d6a6e0d4b am: faf27ff64c
Change-Id: I2d07d8fbd5d43d4dd2d10293d3dffae13d58ca9e
2020-03-04 06:09:59 +00:00
Automerger Merge Worker
e342a89cad [automerger skipped] Merge "Move DnsSdTxtRecord to net common static library" am: 8d6a6e0d4b am: faf27ff64c -s ours
am skip reason: Change-Id I6118b313ce668707d598aa2eab9baee2f7622dbc with SHA-1 1970749b57 is in history

Change-Id: I678c69314756955e3b6182ab6b25ba7395bedd97
2020-03-04 06:09:52 +00:00
Automerger Merge Worker
faf27ff64c Merge "Move DnsSdTxtRecord to net common static library" am: 8d6a6e0d4b
Change-Id: I1101a06ab084e1ff61a785f78b1ae5ac50bfbcd8
2020-03-04 05:56:55 +00:00
Aaron Huang
e045a555af Move DnsSdTxtRecord to net common static library
DnsSdTxtRecord is moved to frameworks/libs/net for mainline
support. Also change the import path using this class.

Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I6118b313ce668707d598aa2eab9baee2f7622dbc
Merged-In: I6118b313ce668707d598aa2eab9baee2f7622dbc
2020-03-02 08:21:26 +00:00
Automerger Merge Worker
9074f2acc8 Merge "Fix crash and duplicated ethernet tethering request" am: 41c82c99df am: b903184cdd
Change-Id: I64f6f64c643e626380403d3e15c6ed4b5f2330ef
2020-02-28 03:04:11 +00:00
Automerger Merge Worker
393687c8f8 Merge "Fix crash and duplicated ethernet tethering request" am: 41c82c99df am: b903184cdd
Change-Id: Ia6b75cce7a748177e99a4b53bb8036e3df3ac835
2020-02-28 03:03:59 +00:00
Automerger Merge Worker
b903184cdd Merge "Fix crash and duplicated ethernet tethering request" am: 41c82c99df
Change-Id: Idd4eca225909f88ef6d57fd8952ae497ec82115b
2020-02-28 02:49:58 +00:00