Junyu Lai
88c8503390
Merge "Add more debug log when onBlockedStatusChanged was called."
2018-10-25 08:57:56 +00:00
junyulai
e06923946c
No-op refactoring of VPN lockdown status check.
...
Currently, if VPN lockdown is disabled, the blocking judgement
inside VPN will return false immediately. It will make
ConnectivityService hard to check blocked status by a given
VPN lockdown status.
Thus, move this check into ConnectivityService and check it
externally.
Bug: 117814902
Test: 1. manual test with 3rd-party vpn app
2. runtest frameworks-net
Change-Id: Ia8319b1a1a12f1058c24badf2431f2ec69bc78e7
2018-10-25 16:43:50 +08:00
junyulai
29e8abebca
Add more debug log when onBlockedStatusChanged was called.
...
Bug: 118355916
Test: 1. runtest frameworks-net
2. enable/disable battery saver
Change-Id: I6d5f9b49be0defd531fc7ea824668bec7863c4b7
2018-10-25 15:20:01 +08:00
Bill Yi
ab2485446f
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 78ab033fd4 -s ours
...
am: 4ba3e811cc -s ours
Change-Id: If860aa9619b4655886dfdac1528940e5e30446fe
2018-10-24 19:40:40 -07:00
Bill Yi
2aeed565f7
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
am: 3521abfe19 -s ours
Change-Id: If3b4a8fabee7b9b74e345d59505040e45588f9e7
2018-10-24 17:20:17 -07:00
Chalard Jean
426e1cca1a
Merge "To support skip464xlat per Network" am: 698b80818c
...
am: e826aa52e4
Change-Id: I944738258051525b371bd17dd3ee7b411b82d12b
2018-10-24 17:19:51 -07:00
Bill Yi
4ba3e811cc
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: 78ab033fd4 -s ours
Change-Id: I2c4b9184789a1bdae2cec06e0e72f6c6ca049113
2018-10-24 17:17:46 -07:00
Nathan Harold
b265835d23
Merge "Move some members to the "Q blacklist"." am: 26f91069c1
...
am: 13c9e7e2f3
Change-Id: Ia2419cce28d26d9464da2a5172cb332b629e943e
2018-10-24 16:14:06 -07:00
Bill Yi
78ab033fd4
Merge pie-platform-release to aosp-master - DO NOT MERGE
...
Change-Id: I695db52f5e22509401258e8b083e7650d401d993
2018-10-24 14:48:44 -07:00
Bill Yi
3521abfe19
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
Change-Id: I13571b072111900d0979f026670e648cdef9899b
2018-10-24 09:08:38 -07:00
Luke Huang
477db5fe1a
Refactor UidRange by using stable aidl structure
...
Use stable aidl generated structure instead of UidRange
Test: runtest frameworks-net passes
Test: manual testing of UidRange related function works
Change-Id: Iaf1c10777dc1e71df2be2a57533a10257b12626b
2018-10-24 19:45:09 +09:00
Chalard Jean
698b80818c
Merge "To support skip464xlat per Network"
2018-10-24 07:15:20 +00:00
Nathan Harold
26f91069c1
Merge "Move some members to the "Q blacklist"."
2018-10-23 21:53:51 +00:00
Mathew Inwood
0e71d36c58
Move some members to the "Q blacklist".
...
Based on some analysis, these fields/methods are likely false positives.
Set maxTargetSdk=P so that any apps using them are required to migrate off
them in future. See the bug for more details.
Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.
Bug: 115609023
Test: m
Merged-In: I719b5c94e5b1f4fa562dd5d655953422958ad37e
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
(cherry picked from commit 2622bdf569 )
2018-10-22 17:28:24 -07:00
hiroaki.yokoyama
a1a397d1d1
ConnectivityService: make log configurable
...
Make log of ConnectivityService configurable by system property.
Two levels:
VERBOSE: whole VDBG log.
DEBUG: selected necessary log for debug purpose.
Relevant log can be enbled in either way:
1. use adb command at run time.
2. config init.xx.rc file at compile time by adding.
on boot && property:ro.build.type=userdebug
setprop log.tag.ConnectivityService DEBUG
Bug: 117632924
Change-Id: I43cc84878c64c5b448853c7393393a02262afd15
2018-10-22 15:59:17 +09:00
Junyu Lai
f91c16b27d
Merge "Add tests for the network blocked status change" am: bbc0585a03 am: e302f75920
...
am: 74cb9f8b81
Change-Id: I0e3367d9641717676653bd54ca41d85422c5d81c
2018-10-19 09:54:18 -07:00
Junyu Lai
304c26b590
Merge "Add new callback to inform blocking of network on specific uid." am: f41deeb4a9 am: 118cf0e236
...
am: b4e045b1b8
Change-Id: I2bec503c5ffac156b679a48c09591458ab716789
2018-10-19 09:47:40 -07:00
Junyu Lai
74cb9f8b81
Merge "Add tests for the network blocked status change" am: bbc0585a03
...
am: e302f75920
Change-Id: Id21571854cd43b724cee170ea458c9f20919c4e6
2018-10-19 09:31:38 -07:00
Junyu Lai
b4e045b1b8
Merge "Add new callback to inform blocking of network on specific uid." am: f41deeb4a9
...
am: 118cf0e236
Change-Id: I24b45f860992626968a6adfb0ff6b6389c85cf45
2018-10-19 09:26:39 -07:00
Junyu Lai
e302f75920
Merge "Add tests for the network blocked status change"
...
am: bbc0585a03
Change-Id: I0f3f93807d9089239f572c487d791acd7a324a2e
2018-10-19 09:18:38 -07:00
Junyu Lai
118cf0e236
Merge "Add new callback to inform blocking of network on specific uid."
...
am: f41deeb4a9
Change-Id: Ia99ee2fbefa67a7ee00d6fecce430ba6431945cd
2018-10-19 09:14:23 -07:00
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