Commit Graph

5839 Commits

Author SHA1 Message Date
Junyu Lai
bbc0585a03 Merge "Add tests for the network blocked status change" 2018-10-19 15:20:48 +00:00
Junyu Lai
f41deeb4a9 Merge "Add new callback to inform blocking of network on specific uid." 2018-10-19 15:20:48 +00:00
Mike Yu
96612aedb1 Add tests for the network blocked status change
onBlockedStatusChanged is intruduced for network blocked status.
The changes in this patch are:
  - Test onBlockedStatusChanged which tells apps whether the
    network is blocked.
  - Fixed the tests which is affected by the order changed in
    onAvailable.

Test: as follows
    - runtest frameworks-net
    - runtest -x NetworkPolicyManagerServiceTest.java
Bug: 74575553
Change-Id: I383c037ed895ef69c478dc3cff69fb1e27c42845
2018-10-19 19:52:50 +08:00
Eran Messeri
7a906817f5 Merge "Enterprise Policy for Private DNS Setting" 2018-10-17 16:59:57 +00:00
Chalard Jean
7edea1df66 Merge changes I66e40b4b,I599a2ff9,I7c210623 am: e70b760e83 am: 26e6255faa
am: b1c0dc57c0

Change-Id: I01b17de0482d9ea7d1bde5579cd707168e499cab
2018-10-16 09:44:37 -07:00
Chalard Jean
b1c0dc57c0 Merge changes I66e40b4b,I599a2ff9,I7c210623 am: e70b760e83
am: 26e6255faa

Change-Id: I97e98da931752c6267d0590ecb8b2ecffc3d603c
2018-10-16 09:27:21 -07:00
Chalard Jean
26e6255faa Merge changes I66e40b4b,I599a2ff9,I7c210623
am: e70b760e83

Change-Id: Iba4bb6d1676d889f1e4a781a7970f01c0e321275
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

Change-Id: I61fea40c9659f1eed1638cc196d309289393d6a5
2018-10-16 02:32:50 -07:00
Luke Huang
41e2ec7084 Merge "Network-related commands porting" am: 5f81fcf08d
am: 39fe20e389

Change-Id: I957050b73afed3e6fde908883568b81198310622
2018-10-16 02:19:35 -07:00
Luke Huang
39fe20e389 Merge "Network-related commands porting"
am: 5f81fcf08d

Change-Id: I96b2bb80cca6e9d80f3f0fe08f7b71ce31b67528
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  -s ours

Change-Id: Id6f6ea6d0799c4e271be5942379033e1545f7551
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  -s ours

Change-Id: I22fe06c9597a6e62239b1871ce63f43e6b44ea3a
2018-10-15 16:24:22 -07:00
chen xu
e3c8a10bf3 [automerger skipped] Merge changes into stage-aosp-master
am: e43baff38b  -s ours

Change-Id: I14f88c998153e945516840acd7d3fbc765dd3357
2018-10-15 16:12:40 -07:00
chen xu
2d20771055 [automerger skipped] Merge changes into stage-aosp-master
am: 214f2425b6  -s ours

Change-Id: I00a27b03ba4c0061bce8c21940abb517aecdc48f
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

Change-Id: Icfc55aefa11a5e1dd92382c2be94c7b63889aa8f
2018-10-15 08:49:52 -07:00
Edward Savage-Jones
4e6851502a Merge changes into stage-aosp-master am: 9d4ecb210e
am: ace28bdb73

Change-Id: I35976332f9bdec9d45e4e35980eaefeebad4ca4a
2018-10-15 08:42:40 -07:00
Beverly Tai
2324b3d28e Merge changes into stage-aosp-master am: 370172f67b
am: 6f14fa9617

Change-Id: Iba66577f1e3c5c952c6ab3a6eb0d74160f280bf6
2018-10-15 08:37:09 -07:00
Lorenzo Colitti
5fe041f889 Merge "Change permissions checks for setAirplaneMode." am: 38149e3ea7
am: 65b71e6a20

Change-Id: Ibe5bbd51adae83e1bfb5a4ab43d29eb2ccd02a8b
2018-10-15 08:29:00 -07:00
Edward Savage-Jones
ace28bdb73 Merge changes into stage-aosp-master
am: 9d4ecb210e

Change-Id: Ifada0acd374477fc5ecddd7bed8c4dc800cf5fb4
2018-10-15 08:17:49 -07:00
Beverly Tai
6f14fa9617 Merge changes into stage-aosp-master
am: 370172f67b

Change-Id: I821951d01aed73f23ace36870362eb0ef875532f
2018-10-15 08:13:53 -07:00
Lorenzo Colitti
65b71e6a20 Merge "Change permissions checks for setAirplaneMode."
am: 38149e3ea7

Change-Id: I578923c3f9012055f715e536f5d4d42ed669c5ee
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
Eran Messeri
120511dbeb Enterprise Policy for Private DNS Setting
A new API for setting the Private DNS settings value programatically via
the DevicePolicyManager.

Since there are two separate settings for Private DNS, and the value
provided for the hostname needs to be validated, a new
DevicePolicyManager API is introduced.

Only a Device Policy Client in Device Owner mode may change these
settings.
The DPC may additionally set a user restriction (added in a separate CL)
to prevent the user from changing Private DNS settings.

Bug: 112982691
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testPrivateDnsPolicy
Change-Id: I566437e4fe10e1346858149120c50b3c20ca073f
2018-10-15 11:53:22 +01: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

Change-Id: I38c35b61b3d50ac320c0aa036c4886c523e27a90
2018-10-12 01:22:20 -07:00
Chalard Jean
5271f56529 Merge "[PT13] Simple cleanup of ProxyTracker." am: db2eff0874
am: 1e161fd7b5

Change-Id: I1e643d5be6d7f791c3bbe3ba018e6ad6717e3ddb
2018-10-12 01:12:12 -07:00
Chalard Jean
1e161fd7b5 Merge "[PT13] Simple cleanup of ProxyTracker."
am: db2eff0874

Change-Id: I6a30f78e517716ca3ff14a3601374fddc65e4aec
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

Change-Id: I8053a79146621f4e9f29fee42ebb7b6d247356ed
2018-10-11 23:26:37 -07:00
Chalard Jean
42912382fe Merge "[PT12] Factor some code into ProxyTracker." am: 665502961c
am: a0785d1a0e

Change-Id: Ib4509788887df4c5c2ef017eb808a38dea0ae00b
2018-10-11 23:10:48 -07:00
Chalard Jean
a0785d1a0e Merge "[PT12] Factor some code into ProxyTracker."
am: 665502961c

Change-Id: Ib92107f434576d8296ba74aab0d9abfe56cefa7c
2018-10-11 22:55:28 -07:00
Yuuki Habu
addf827426 To support skip464xlat per Network
To add skip464exlat in NetworkMisc.
NetworkAgent can skip to start 464xlat if need.
(e.g. IMS PDN for Cellular can be disabled)

Device will treat the network as IPv6-only if it is set

Bug: 69949375
Test: Nat464XlatTest, ConnectivityServiceTest

Change-Id: I676a02cb92530d64f29f34e89482a934f3ec4553
2018-10-12 14:35:30 +09:00
Chalard Jean
972b3542f2 Merge "Add log for debugging ConnectivityManager" am: 12f8847e40 am: 7a6ad8e2a9
am: a13fd2333b

Change-Id: I23a34c21d05db126d8d2aacdeb700b3d2b2ed018
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

Change-Id: I2d8604c172b26e474050afd45fba74dc6c2c18bc
2018-10-11 21:21:45 -07:00
Chalard Jean
7a6ad8e2a9 Merge "Add log for debugging ConnectivityManager"
am: 12f8847e40

Change-Id: I666e534f42a930a2d0fee55032d7a9e4516349c0
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

Change-Id: I33046e52ac1c59f755ef30cbf39203d914ed77c6
2018-10-11 09:32:42 -07:00
Andreas Gampe
3e55c07146 Merge changes into stage-aosp-master am: f4bd5dd297
am: 172249cd40

Change-Id: I30ae82f0c51c2c47474dcfc44de32fea1153a4cf
2018-10-11 09:26:17 -07:00
Andreas Gampe
a7045c2863 Merge changes into stage-aosp-master
am: c9fae266fb

Change-Id: Iee2f5645cbe6122eececc1f0517175daa5b414ed
2018-10-11 09:18:51 -07:00
Andreas Gampe
172249cd40 Merge changes into stage-aosp-master
am: f4bd5dd297

Change-Id: Ic989692175b2763d58d3cbc169919ee24d2ba2d0
2018-10-11 09:13:43 -07:00