Commit Graph

5372 Commits

Author SHA1 Message Date
Android Build Merger (Role)
ae3f1ec7d0 Merge changes into pi-dev-plus-aosp 2018-10-26 02:59:16 +00:00
Junyu Lai
614be6b9cc Merge "Add more debug log when onBlockedStatusChanged was called." am: 88c8503390
am: 15a1448db3

Change-Id: I67665df7729ae7d490fb3f8b41484df6012f257d
2018-10-25 02:45:21 -07:00
Junyu Lai
15a1448db3 Merge "Add more debug log when onBlockedStatusChanged was called."
am: 88c8503390

Change-Id: I6f5e1af022e43e954b019894a5efb4e6cf8d4846
2018-10-25 02:35:52 -07:00
Junyu Lai
88c8503390 Merge "Add more debug log when onBlockedStatusChanged was called." 2018-10-25 08:57:56 +00: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
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
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
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
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
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
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
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
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
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
665502961c Merge "[PT12] Factor some code into ProxyTracker." 2018-10-12 04:23:16 +00:00