Chalard Jean
7edea1df66
Merge changes I66e40b4b,I599a2ff9,I7c210623 am: e70b760e83 am: 26e6255faa
...
am: b1c0dc57c0
2018-10-16 09:44:37 -07:00
Chalard Jean
b1c0dc57c0
Merge changes I66e40b4b,I599a2ff9,I7c210623 am: e70b760e83
...
am: 26e6255faa
2018-10-16 09:27:21 -07:00
Chalard Jean
26e6255faa
Merge changes I66e40b4b,I599a2ff9,I7c210623
...
am: e70b760e83
2018-10-16 09:14:22 -07:00
Treehugger Robot
e70b760e83
Merge changes I66e40b4b,I599a2ff9,I7c210623
...
* changes:
[PT16] Simplification of sendProxyBroadcast.
[PT15] Tiny bugfix in setGlobalProxy
[PT14] No-op refactoring of sendProxyBroadcast
2018-10-16 14:48:33 +00:00
Luke Huang
a99874dc9c
Merge "Network-related commands porting" am: 5f81fcf08d am: 39fe20e389
...
am: 41e2ec7084
2018-10-16 02:32:50 -07:00
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
882a191c6f
[automerger skipped] Merge changes into stage-aosp-master am: e43baff38b -s ours
...
am: e3c8a10bf3
2018-10-15 16:30:09 -07:00
chen xu
632428ed4e
[automerger skipped] Merge changes into stage-aosp-master am: 214f2425b6 -s ours
...
am: 2d20771055
2018-10-15 16:24:22 -07: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
d96f450cb2
Merge "Change permissions checks for setAirplaneMode." am: 38149e3ea7 am: 65b71e6a20
...
am: 5fe041f889
2018-10-15 08:49:52 -07:00
Edward Savage-Jones
4e6851502a
Merge changes into stage-aosp-master am: 9d4ecb210e
...
am: ace28bdb73
2018-10-15 08:42:40 -07:00
Beverly Tai
2324b3d28e
Merge changes into stage-aosp-master am: 370172f67b
...
am: 6f14fa9617
2018-10-15 08:37:09 -07: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
110cb12040
[PT16] Simplification of sendProxyBroadcast.
...
sendProxyBroadcast is always called with the same argument, and
it would make no sense with another argument anyway. Remove it.
This concludes the ProxyTracker refactoring with 227 lines removed
from ConnectivityService, a lot clarified, and some bugs removed.
Things can still be improved, but presumably at a much higher cost.
Next steps are : write tests, now that ProxyTracker is both testable
and mockable. And try to pour some gasoline on the PROXY_CHANGE_ACTION
broadcast, see if it burns well.
Test: runtest
Change-Id: I66e40b4bf5cfd0b2dc4fa37ea97b3429fe1b7e6c
2018-10-15 12:58:41 +09:00
Chalard Jean
0d21a064a6
[PT15] Tiny bugfix in setGlobalProxy
...
This bug has existed for a long time. If mDefaultProxyEnabled is
false, then the mDefaultProxy member should obviously not be used
in the broadcast.
Test: runtest
Change-Id: I599a2ff9f96d4667e824cf000c2125f86010bb02
2018-10-15 12:58:41 +09:00
Chalard Jean
1836a63e92
[PT14] No-op refactoring of sendProxyBroadcast
...
If mGlobalProxy is non-null, then getDefaultProxy returns mGlobalProxy
so the first change is a no-op.
If mGlobalProxy is null and mDefaultProxyEnabled is true, then
getDefaultProxy returns mDefaultProxy, which has just been set to
proxyInfo, so the second change is a no-op.
If mGlobalProxy is null and mDefaultProxyEnabled is true, then
getDefaultProxy returns mDefaultProxy ; if mGlobalProxy is null and
mDefaultProxyEnabled is false, then getDefaultProxy returns null,
therefore the third change is a no-op.
Test: runtest
Change-Id: I7c21062302bf54f4fc917c82e0175975051a55ec
2018-10-15 12:58:40 +09:00
Chalard Jean
3699801778
Merge "[PT13] Simple cleanup of ProxyTracker." am: db2eff0874 am: 1e161fd7b5
...
am: 5271f56529
2018-10-12 01:22:20 -07: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
ee5ea78d37
Merge "[PT12] Factor some code into ProxyTracker." am: 665502961c am: a0785d1a0e
...
am: 42912382fe
2018-10-11 23:26:37 -07: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
972b3542f2
Merge "Add log for debugging ConnectivityManager" am: 12f8847e40 am: 7a6ad8e2a9
...
am: a13fd2333b
2018-10-11 21:29:52 -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
5e277981b1
Merge changes into stage-aosp-master am: c9fae266fb
...
am: a7045c2863
2018-10-11 09:32:42 -07:00
Andreas Gampe
3e55c07146
Merge changes into stage-aosp-master am: f4bd5dd297
...
am: 172249cd40
2018-10-11 09:26:17 -07: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
bca532143c
Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker" am: 782db99fa1 am: 1c4c870faf
...
am: b63c1baea4
2018-10-11 07:06:43 -07: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
