Valentin Iftime
e942babfef
resolve merge conflicts of 395a0a5e69 to master
...
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ia9db1400207d9196012362c480ede059e94184af
2019-10-08 22:21:44 +02:00
Iavor-Valentin Iftime
395a0a5e69
Merge "API to detect which network interfaces support wake-on-lan" am: 1d47b3ab03 am: 70001b0aca
...
am: aff235b45b
Change-Id: I706ad94dfb2645f5f66869a48390b5fcb22bbda2
2019-10-08 08:41:09 -07:00
Iavor-Valentin Iftime
aff235b45b
Merge "API to detect which network interfaces support wake-on-lan" am: 1d47b3ab03
...
am: 70001b0aca
Change-Id: I2982ec474e6806263ed804ad05812613b03063e0
2019-10-08 08:34:42 -07:00
Iavor-Valentin Iftime
70001b0aca
Merge "API to detect which network interfaces support wake-on-lan"
...
am: 1d47b3ab03
Change-Id: I6239ae68559290e31f8c9384e0f973cfea30a1c7
2019-10-08 08:23:23 -07:00
Iavor-Valentin Iftime
1d47b3ab03
Merge "API to detect which network interfaces support wake-on-lan"
2019-10-08 15:08:18 +00:00
Valentin Iftime
a039e57ead
API to detect which network interfaces support wake-on-lan
...
Add a new method in LinkProperties, isWakeOnLanEnabled() which returns
true if network interface is defined in config_wakeonlan_enabled_interfaces
string-array (config.xml)
Bug: 132705025
Test: atest LinkPropertiesTest & atest ConnectivityServiceTest
Change-Id: I3f7803aafd2f8eaf8aa18419b21339e15d4b7a0b
2019-10-08 13:03:30 +02:00
Roshan Pius
8db8e86dbe
Merge "ConnectivityService: Grant networkstack uid extra privileges" am: 0bb25f4be7 am: bc1ff193a2 am: 741cf8563c
...
am: 74619830a3
Change-Id: I3620f018e5a1c203385f2997a42ff4a9e536f735
2019-10-07 20:57:56 -07:00
Roshan Pius
74619830a3
Merge "ConnectivityService: Grant networkstack uid extra privileges" am: 0bb25f4be7 am: bc1ff193a2
...
am: 741cf8563c
Change-Id: Ib7c3190806733244672a38822febd7f2d37195b6
2019-10-07 20:50:45 -07:00
Roshan Pius
741cf8563c
Merge "ConnectivityService: Grant networkstack uid extra privileges" am: 0bb25f4be7
...
am: bc1ff193a2
Change-Id: Ib5437cb8eece577e91ed7d65f1f22170f0c88204
2019-10-07 20:44:06 -07:00
Roshan Pius
bc1ff193a2
Merge "ConnectivityService: Grant networkstack uid extra privileges"
...
am: 0bb25f4be7
Change-Id: I1bdf4e65fc11a6528818d53e3034c883b2ef8c8b
2019-10-07 20:37:50 -07:00
Treehugger Robot
0bb25f4be7
Merge "ConnectivityService: Grant networkstack uid extra privileges"
2019-10-08 03:12:58 +00:00
Chalard Jean
e9510d441d
Merge "Rename CallbackRecord to CallbackEntry" am: 63fea675c7 am: 5420ad47ea am: aa7cc7e151
...
am: 6da7a7e5f3
Change-Id: I417110875ccf4f1df9af5829c2702a5391f9b970
2019-10-06 23:09:29 -07:00
Chalard Jean
6da7a7e5f3
Merge "Rename CallbackRecord to CallbackEntry" am: 63fea675c7 am: 5420ad47ea
...
am: aa7cc7e151
Change-Id: If53d8d66c21d27a5e77a48a5234092aaa0bf8ad0
2019-10-06 23:03:02 -07:00
Chalard Jean
aa7cc7e151
Merge "Rename CallbackRecord to CallbackEntry" am: 63fea675c7
...
am: 5420ad47ea
Change-Id: I07ef4756a74c0c670fc5fbb4bdd8ac61344adc0a
2019-10-06 22:50:49 -07:00
Chalard Jean
5420ad47ea
Merge "Rename CallbackRecord to CallbackEntry"
...
am: 63fea675c7
Change-Id: Ibfe98cf26ee65711b5366edfc5d95e64dcfec266
2019-10-06 22:39:47 -07:00
Chalard Jean
63fea675c7
Merge "Rename CallbackRecord to CallbackEntry"
2019-10-07 05:28:57 +00:00
Chalard Jean
f7edecb54a
Rename CallbackRecord to CallbackEntry
...
Test: FrameworkNetTests NetworkStackTests
Change-Id: I8f6ea8fb6879cf7c40396d92f13cb5e12cc45ee7
2019-10-07 13:00:50 +09:00
Roshan Pius
111b1b00cc
ConnectivityService: Grant networkstack uid extra privileges
...
The wifi network factories/agents are going to run in the network stack
process for devices which accept wifi mainline module. Allow these
factories/agents to perform privileged operations.
Bug: 142115344
Test: ACTS test
Change-Id: I2dd412ac5c6b67f52c87113fcda345e1f531f9c4
WifiNetworkRequestTest:test_connect_failure_user_rejected passes now.
(cherry-picked from c7580b1d59ee126cd6867cb6fe4485a69e2b4622)
2019-10-06 14:32:19 -07:00
Chalard Jean
876e9db00d
Merge "Decrease load-related flakiness in ConnectivityServiceTest" am: cc1381518d am: d8b3b06742 am: b3e1e0b4dc
...
am: fcf0fb6fe9
Change-Id: Ic9e2f620ad30b2fbe2097233ab2a1e17ed0e59cd
2019-10-02 14:37:30 -07:00
Chalard Jean
fcf0fb6fe9
Merge "Decrease load-related flakiness in ConnectivityServiceTest" am: cc1381518d am: d8b3b06742
...
am: b3e1e0b4dc
Change-Id: I420cd819d30b701b9d796457de8f63d0d97008db
2019-10-02 14:11:53 -07:00
Chalard Jean
a4073a7281
Merge "Opportunistic cleanup" am: 493f8c38bf am: e0322987da am: b38ec9b059
...
am: 0554379953
Change-Id: I378fdf509b5d917ee437b5b5ad7671d6066c36ef
2019-10-02 13:43:49 -07:00
Chalard Jean
b3e1e0b4dc
Merge "Decrease load-related flakiness in ConnectivityServiceTest" am: cc1381518d
...
am: d8b3b06742
Change-Id: I99a86fe849bc53db28c270680546d4035c0a8610
2019-10-02 13:25:24 -07:00
Chalard Jean
0554379953
Merge "Opportunistic cleanup" am: 493f8c38bf am: e0322987da
...
am: b38ec9b059
Change-Id: Ibf700bf59f6eae328b617c0df2c0c382bb97e0cd
2019-10-02 13:20:50 -07:00
Chalard Jean
b38ec9b059
Merge "Opportunistic cleanup" am: 493f8c38bf
...
am: e0322987da
Change-Id: I467dd780d1ca25ae53f3205288ec1797451a80bf
2019-10-02 12:55:37 -07:00
Chalard Jean
d8b3b06742
Merge "Decrease load-related flakiness in ConnectivityServiceTest"
...
am: cc1381518d
Change-Id: I22cf33a9eff84c07706d284499f87b5bd4ac157b
2019-10-01 19:55:46 -07:00
Chalard Jean
cc1381518d
Merge "Decrease load-related flakiness in ConnectivityServiceTest"
2019-10-02 02:38:30 +00:00
Chalard Jean
e0322987da
Merge "Opportunistic cleanup"
...
am: 493f8c38bf
Change-Id: I5ac4ae5f941e741a88c595ae5f12b804a758abe6
2019-09-30 22:38:25 -07:00
Chalard Jean
493f8c38bf
Merge "Opportunistic cleanup"
2019-10-01 05:25:57 +00:00
Chalard Jean
bb3e64fdc5
Opportunistic cleanup
...
Test: FrameworksNetTests NetworkStackTests
Change-Id: I370ad15fb0d8301f9720caf5296365c04aebeb62
2019-09-30 19:12:25 +09:00
Lorenzo Colitti
6a99ce4c23
Merge "Properly test TrafficController permissions on package updates." am: 038d906ac8 am: 9b5daf2034 am: 90fef6a390
...
am: 31306dffbf
Change-Id: If94f4e0d7816adc978d95d2c1d8458fcd138447d
2019-09-27 18:40:44 -07:00
Chalard Jean
5ea0f921bb
Decrease load-related flakiness in ConnectivityServiceTest
...
Almost always this timeout is not waited anyway.
Test: ConnectivityServiceTest
Change-Id: I74376633d0ec8d93fb48609a4df73cad5fc5d508
2019-09-27 21:44:54 +09:00
Lorenzo Colitti
31306dffbf
Merge "Properly test TrafficController permissions on package updates." am: 038d906ac8 am: 9b5daf2034
...
am: 90fef6a390
Change-Id: I868e666cf85ec7d71115fb431ff4a42f5d7861d7
2019-09-26 23:02:55 -07:00
Lorenzo Colitti
90fef6a390
Merge "Properly test TrafficController permissions on package updates." am: 038d906ac8
...
am: 9b5daf2034
Change-Id: I9be962d0d9fcf4697ef2998055247186b466470a
2019-09-26 22:55:47 -07:00
Lorenzo Colitti
9b5daf2034
Merge "Properly test TrafficController permissions on package updates."
...
am: 038d906ac8
Change-Id: Ia6d480739fadaa7b3277d9b6e9abc303b8e551b4
2019-09-26 22:48:57 -07:00
Treehugger Robot
038d906ac8
Merge "Properly test TrafficController permissions on package updates."
2019-09-27 05:35:25 +00:00
Chalard Jean
9321cd0640
Merge "Fix TestNetworkAgentWrapper flakiness" am: 9f0dc317cc am: 1f31fe7f98 am: b7f60d5992
...
am: 82e8e2146a
Change-Id: Id9cd742d1c83903a853b66ca3a84d589597e92d3
2019-09-25 02:36:54 -07:00
Chalard Jean
82e8e2146a
Merge "Fix TestNetworkAgentWrapper flakiness" am: 9f0dc317cc am: 1f31fe7f98
...
am: b7f60d5992
Change-Id: Ia8b281648ceb9bf0a8424de024c9ae62daed0ae5
2019-09-25 02:30:51 -07:00
Chalard Jean
b7f60d5992
Merge "Fix TestNetworkAgentWrapper flakiness" am: 9f0dc317cc
...
am: 1f31fe7f98
Change-Id: I281e0f6f4f11c88107d67446fb14d1fa2244ebbb
2019-09-25 02:23:14 -07:00
Chalard Jean
1f31fe7f98
Merge "Fix TestNetworkAgentWrapper flakiness"
...
am: 9f0dc317cc
Change-Id: I7a20018464b1df7399fd093d2b3259aeb0bca194
2019-09-25 02:16:15 -07:00
Chalard Jean
9f0dc317cc
Merge "Fix TestNetworkAgentWrapper flakiness"
2019-09-25 08:58:34 +00:00
Oscar Shu
089bfd550d
Merge "Followup to CL 1103896" am: e4713e7f18 am: f59fb89406 am: 08eb639ef6
...
am: c204fb1f40
Change-Id: I9aec9d7481722e2533200dcab9bc9066142496a1
2019-09-24 16:06:25 -07:00
Oscar Shu
c204fb1f40
Merge "Followup to CL 1103896" am: e4713e7f18 am: f59fb89406
...
am: 08eb639ef6
Change-Id: Ib12919fd26c38eca96a96cf2e797cf333ac20b1f
2019-09-24 15:54:37 -07:00
Oscar Shu
08eb639ef6
Merge "Followup to CL 1103896" am: e4713e7f18
...
am: f59fb89406
Change-Id: I7625bcd13f7ce9064e71645d21af39e8034d1a11
2019-09-24 15:41:00 -07:00
Oscar Shu
f59fb89406
Merge "Followup to CL 1103896"
...
am: e4713e7f18
Change-Id: I1eb784a8266880260d75ca109c7d78f180333a0e
2019-09-24 15:28:23 -07:00
Oscar Shu
e4713e7f18
Merge "Followup to CL 1103896"
2019-09-24 22:06:27 +00:00
Lorenzo Colitti
8cef832e6b
Merge "notify netd about uid internet permission changes when package replaced" into qt-qpr1-dev am: 34c5cbeba2
...
am: f37198dd53
Change-Id: Icbaa97a0c8bd7fe2700fde1eb0aad32a284f8aee
2019-09-20 18:51:12 -07:00
Lorenzo Colitti
f37198dd53
Merge "notify netd about uid internet permission changes when package replaced" into qt-qpr1-dev
...
am: 34c5cbeba2
Change-Id: I4be29ac58124838dc7e4c5c99fd9bb4ffe3e36c9
2019-09-20 18:38:50 -07:00
xshu
6aa877983e
Followup to CL 1103896
...
Optimizes the logic that ensures the default randomized MAC is not
returned.
Bug: 137796328
Test: atest MacAddressTest
Change-Id: Ie95d7a020bfac8850b8a67e4d396de77db22e1db
2019-09-20 16:56:54 -07:00
Chalard Jean
4e9ecc6f34
Fix TestNetworkAgentWrapper flakiness
...
The underlying issue here is that before aosp/986824 the call to
waitForIdle is the local ConnectivityServiceTest function, but
after that patch TestNetworkAgentWrapper has an identically
named member that only wait for its own handler.
Bug: 141341704
Test: ConnectivityServiceTest --generate-new-metrics 100
Change-Id: I38709cc69ec7a261c1c6e008abe03d2882e2083d
2019-09-20 17:19:31 +09:00
wangmingming1
17533200fb
notify netd about uid internet permission changes when package replaced
...
1. If a previous version of an app doesn't declare internet permission;
2. The User upgraded it to a new version and the new one does declare the
internet permission;
3. The new app are not allowed to access the internet until next boot
Bug: 137864893
Test: Manual, just make sure the onPackageChanged would be executed on package changes
Change-Id: I69cdbb16a027a9c4e974b32371b1f64a23a51a23
Signed-off-by: wangmingming1 <wangmingming1@xiaomi.com >
2019-09-20 03:23:23 +00:00