Luke Huang
41e2ec7084
Merge "Network-related commands porting" am: 5f81fcf08d
...
am: 39fe20e389
2018-10-16 02:19:35 -07:00
Luke Huang
39fe20e389
Merge "Network-related commands porting"
...
am: 5f81fcf08d
2018-10-16 01:09:30 -07:00
Luke Huang
5f81fcf08d
Merge "Network-related commands porting"
2018-10-16 07:44:37 +00:00
chen xu
e3c8a10bf3
[automerger skipped] Merge changes into stage-aosp-master
...
am: e43baff38b
2018-10-15 16:12:40 -07:00
chen xu
2d20771055
[automerger skipped] Merge changes into stage-aosp-master
...
am: 214f2425b6
2018-10-15 16:08:29 -07:00
Android Build Merger (Role)
e43baff38b
Merge changes into stage-aosp-master
2018-10-15 22:44:53 +00:00
Android Build Merger (Role)
214f2425b6
Merge changes into stage-aosp-master
2018-10-15 22:44:53 +00:00
Lorenzo Colitti
5fe041f889
Merge "Change permissions checks for setAirplaneMode." am: 38149e3ea7
...
am: 65b71e6a20
2018-10-15 08:29:00 -07:00
Edward Savage-Jones
ace28bdb73
Merge changes into stage-aosp-master
...
am: 9d4ecb210e
2018-10-15 08:17:49 -07:00
Beverly Tai
6f14fa9617
Merge changes into stage-aosp-master
...
am: 370172f67b
2018-10-15 08:13:53 -07:00
Lorenzo Colitti
65b71e6a20
Merge "Change permissions checks for setAirplaneMode."
...
am: 38149e3ea7
2018-10-15 08:03:52 -07:00
Android Build Merger (Role)
9d4ecb210e
Merge changes into stage-aosp-master
2018-10-15 15:00:04 +00:00
Android Build Merger (Role)
370172f67b
Merge changes into stage-aosp-master
2018-10-15 15:00:04 +00:00
Lorenzo Colitti
38149e3ea7
Merge "Change permissions checks for setAirplaneMode."
2018-10-15 13:36:45 +00:00
Chalard Jean
5271f56529
Merge "[PT13] Simple cleanup of ProxyTracker." am: db2eff0874
...
am: 1e161fd7b5
2018-10-12 01:12:12 -07:00
Chalard Jean
1e161fd7b5
Merge "[PT13] Simple cleanup of ProxyTracker."
...
am: db2eff0874
2018-10-12 00:50:29 -07:00
Lorenzo Colitti
c7da00d199
Change permissions checks for setAirplaneMode.
...
Require NETWORK_SETTINGS (or NETWORK_SETUP_WIZARD) instead of the
legacy CONNECTIVITY_INTERNAL permission. The users are as follows:
- The system callers (Phone, Settings, SystemUI, VrSettings) all
have NETWORK_SETTINGS.
- SetupWizard has NETWORK_SETUP_WIZARD
- sl4a has NETWORK_STACK
Bug: 115302596
Test: builds, boots, airplane mode via SystemUI works
Change-Id: I8ca40182bd8b5e3fd9a82296c0cc28de30ed4baf
2018-10-12 16:35:46 +09:00
Chalard Jean
db2eff0874
Merge "[PT13] Simple cleanup of ProxyTracker."
2018-10-12 07:34:43 +00:00
Chalard Jean
42912382fe
Merge "[PT12] Factor some code into ProxyTracker." am: 665502961c
...
am: a0785d1a0e
2018-10-11 23:10:48 -07:00
Chalard Jean
a0785d1a0e
Merge "[PT12] Factor some code into ProxyTracker."
...
am: 665502961c
2018-10-11 22:55:28 -07:00
Chalard Jean
665502961c
Merge "[PT12] Factor some code into ProxyTracker."
2018-10-12 04:23:16 +00:00
Chalard Jean
a13fd2333b
Merge "Add log for debugging ConnectivityManager" am: 12f8847e40
...
am: 7a6ad8e2a9
2018-10-11 21:21:45 -07:00
Chalard Jean
7a6ad8e2a9
Merge "Add log for debugging ConnectivityManager"
...
am: 12f8847e40
2018-10-11 21:11:51 -07:00
Chalard Jean
12f8847e40
Merge "Add log for debugging ConnectivityManager"
2018-10-12 03:14:48 +00:00
Andreas Gampe
a7045c2863
Merge changes into stage-aosp-master
...
am: c9fae266fb
2018-10-11 09:18:51 -07:00
Andreas Gampe
172249cd40
Merge changes into stage-aosp-master
...
am: f4bd5dd297
2018-10-11 09:13:43 -07:00
Android Build Merger (Role)
c9fae266fb
Merge changes into stage-aosp-master
2018-10-11 15:45:44 +00:00
Android Build Merger (Role)
f4bd5dd297
Merge changes into stage-aosp-master
2018-10-11 15:45:44 +00:00
Chalard Jean
b63c1baea4
Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker" am: 782db99fa1
...
am: 1c4c870faf
2018-10-11 06:48:47 -07:00
Chalard Jean
1c4c870faf
Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker"
...
am: 782db99fa1
2018-10-11 06:36:29 -07:00
Treehugger Robot
782db99fa1
Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker"
2018-10-11 12:50:17 +00:00
Lorenzo Colitti
ff944740c3
Merge "Make setAirplaneMode @SystemApi for SetupWizard." am: 772b75c26d
...
am: c37dffde10
2018-10-10 20:26:35 -07:00
Lorenzo Colitti
c37dffde10
Merge "Make setAirplaneMode @SystemApi for SetupWizard."
...
am: 772b75c26d
Change-Id: Ib418ca0a9f8d9be9c4bdc419c9d2ed05aa47a49d
2018-10-10 20:14:03 -07:00
Lorenzo Colitti
0bfef02a24
Make setAirplaneMode @SystemApi for SetupWizard.
...
Expose ConnectivityManager#setAirplaneMode and the
NETWORK_SETUP_WIZARD permission so that SetupWizard can call
setAirplaneMode.
Delete setAirplaneMode from the greylist because the permissions
checks on it, since at least 2013, have been for a privileged
permission (CONNECTIVITY_INTERNAL) that normal apps don't have.
Test: m
Bug: 115302596
Change-Id: I28f24d32c4b4b386407e9e0e3514ea9f8854f4a8
2018-10-10 17:50:05 +09:00
Soi, Yoshinari
b8102ef4d7
Add log for debugging ConnectivityManager
...
Add log to ConnectivityManager for better investigations of issue.
This patch adds StackTrace to the following APIs.
reportInetCondition()
reportBadNetwork()
reportNetworkConnectivity()
sendRequestForNetwork()
requestNetwork()
releaseNetworkRequest()
registerNetworkCallback()
unregisterNetworkCallback()
Bug: 116751720
Change-Id: I992292cd9d6f3d69c91ddbde5577591f9ec0f39b
2018-10-10 11:56:04 +09:00
Luke Huang
b913c8165e
Network-related commands porting
...
Test: runtest frameworks-net passes
Test: manual testing of network related function works
Change-Id: Id197d20c80b04378731b113ad74676672bd8b67e
2018-10-09 11:29:02 +08:00
Yan Yan
51d3eded50
Merge changes I10c01f2b,Ie05bc535 am: 90a0bdb98a
...
am: e09f9d1a93
2018-10-05 12:13:20 -07:00
Igor Murashkin
10cd239a14
Merge changes into stage-aosp-master
...
am: b8480d5bda
2018-10-05 11:57:18 -07:00
Igor Murashkin
e0065199ea
Merge changes into stage-aosp-master
...
am: 8b2dc0adc6
2018-10-05 11:50:43 -07:00
Yan Yan
e09f9d1a93
Merge changes I10c01f2b,Ie05bc535
...
am: 90a0bdb98a
2018-10-05 11:47:12 -07:00
Yan Yan
90a0bdb98a
Merge changes I10c01f2b,Ie05bc535
...
* changes:
Check to ensure UDP-encap is used only for IPv4
Add UDP encapsulation tests for IpSecService.
2018-10-05 17:38:41 +00:00
Android Build Merger (Role)
b8480d5bda
Merge changes into stage-aosp-master
2018-10-05 17:35:26 +00:00
Android Build Merger (Role)
8b2dc0adc6
Merge changes into stage-aosp-master
2018-10-05 17:35:26 +00:00
Chalard Jean
b3ba9ff8ab
Merge "[PT10] Move loadGlobalProxy into ProxyTracker." am: 79822ffb6f
...
am: fa17d29fa9
2018-10-05 02:33:45 -07:00
Chalard Jean
fa17d29fa9
Merge "[PT10] Move loadGlobalProxy into ProxyTracker."
...
am: 79822ffb6f
Change-Id: If5d2eb35f1c990fc6af5747fb2f8e3d55afb7eb9
2018-10-05 02:22:44 -07:00
Chalard Jean
f9d8e07ea0
[PT13] Simple cleanup of ProxyTracker.
...
ProxyInfo#getPacFileUrl() is guaranteed to return non-null.
Test: runtest
Change-Id: Id206829441f01c6ed4066028de3e1f7fcbe8930b
2018-10-05 16:40:06 +09:00
Chalard Jean
bf650912c6
[PT12] Factor some code into ProxyTracker.
...
Test: runtest
Change-Id: Ic61ef1e735dcc988cf8fc698b853f3b3be331d8b
2018-10-05 16:40:02 +09:00
Chalard Jean
0933537df9
[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker
...
This contains a significant logic change : it will load the
deprecated proxy settings synchronously instead of on the next
run loop. I think this is okay because it would happen almost
immediately anyway, and there is nothing in ConnectivityService
that might be changing this setting in the mean time. As for
the possibility that this was executed in the handler because
of possible disk access, I want to point out that the
loadGlobalProxy method that now calls this was already doing
those same similar accesses.
Test: runtest
Change-Id: Idc6f260e2a337689dc274eb758eb00f6a31089bb
2018-10-05 16:39:53 +09:00
Chalard Jean
e4f9bd95ec
[PT10] Move loadGlobalProxy into ProxyTracker.
...
Test: runtest
Change-Id: Id1c57ebb575c8742310be4822ec6e3fa03f487c3
2018-10-05 16:37:38 +09:00
Andrew Solovay
1ea270c94d
resolve merge conflicts of a3e34fe9fe4e2a8d0932e574721e5a8b94396c5e to pi-dev-plus-aosp
...
Bug: None
Test: Eyeballed (comment-only change).
Change-Id: Ia644cde66376b2bddeb27bb2a147b3266037aa2c
Exempt-From-Owner-Approval: Docs-only change
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
2018-10-04 22:50:39 +00:00
