Commit graph

5,367 commits

Message SHA1
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 6155b25f24 -s ours
am: 82c3e8e924  -s ours

Change-Id: If860aa9619b4655886dfdac1528940e5e30446fe

Bill Yi   authored and   android-build-merger   commited 2018-10-24 19:40:40 -07:00
379b7cd888
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: 6fab283a18  -s ours

Change-Id: If3b4a8fabee7b9b74e345d59505040e45588f9e7

Bill Yi   authored and   android-build-merger   commited 2018-10-24 17:20:17 -07:00
d4b216e0e2
Merge "To support skip464xlat per Network" am: 2d23f14c9e
am: e826aa52e4

Change-Id: I944738258051525b371bd17dd3ee7b411b82d12b

Chalard Jean   authored and   android-build-merger   commited 2018-10-24 17:19:51 -07:00
153c48b434
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 6155b25f24  -s ours

Change-Id: I2c4b9184789a1bdae2cec06e0e72f6c6ca049113

Bill Yi   authored and   android-build-merger   commited 2018-10-24 17:17:46 -07:00
82c3e8e924
Merge "Move some members to the "Q blacklist"." am: 8d6a9818f0
am: 13c9e7e2f3

Change-Id: Ia2419cce28d26d9464da2a5172cb332b629e943e

Nathan Harold   authored and   android-build-merger   commited 2018-10-24 16:14:06 -07:00
ab447742ee
Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I695db52f5e22509401258e8b083e7650d401d993

Bill Yi   commited 2018-10-24 14:48:44 -07:00
6155b25f24
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
Change-Id: I13571b072111900d0979f026670e648cdef9899b

Bill Yi   commited 2018-10-24 09:08:38 -07:00
6fab283a18
Merge "To support skip464xlat per Network"
Chalard Jean   authored and   Gerrit Code Review   commited 2018-10-24 07:15:20 +00:00
2d23f14c9e
Merge "Move some members to the "Q blacklist"."
Nathan Harold   authored and   Gerrit Code Review   commited 2018-10-23 21:53:51 +00:00
8d6a9818f0
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 15cfeb58a4)

Mathew Inwood   authored and   Nathan Harold   commited 2018-10-22 17:28:24 -07:00
df1c689315
Merge "Add tests for the network blocked status change" am: f1d996ac11
am: cd2c08a219

Change-Id: Id21571854cd43b724cee170ea458c9f20919c4e6

Junyu Lai   authored and   android-build-merger   commited 2018-10-19 09:31:38 -07:00
5b2bc8d401
Merge "Add new callback to inform blocking of network on specific uid." am: c7a2d957b0
am: d896c9a4e5

Change-Id: I24b45f860992626968a6adfb0ff6b6389c85cf45

Junyu Lai   authored and   android-build-merger   commited 2018-10-19 09:26:39 -07:00
8a53397b4c
Merge "Add tests for the network blocked status change"
am: f1d996ac11

Change-Id: I0f3f93807d9089239f572c487d791acd7a324a2e

Junyu Lai   authored and   android-build-merger   commited 2018-10-19 09:18:38 -07:00
cd2c08a219
Merge "Add new callback to inform blocking of network on specific uid."
am: c7a2d957b0

Change-Id: Ia99ee2fbefa67a7ee00d6fecce430ba6431945cd

Junyu Lai   authored and   android-build-merger   commited 2018-10-19 09:14:23 -07:00
d896c9a4e5
Merge "Add tests for the network blocked status change"
Junyu Lai   authored and   Gerrit Code Review   commited 2018-10-19 15:20:48 +00:00
f1d996ac11
Merge "Add new callback to inform blocking of network on specific uid."
Junyu Lai   authored and   Gerrit Code Review   commited 2018-10-19 15:20:48 +00:00
c7a2d957b0
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

Mike Yu   commited 2018-10-19 19:52:50 +08:00
b8c1f78f0d
Merge changes I66e40b4b,I599a2ff9,I7c210623 am: 7b0604a191
am: 2a01b50b17

Change-Id: I97e98da931752c6267d0590ecb8b2ecffc3d603c

Chalard Jean   authored and   android-build-merger   commited 2018-10-16 09:27:21 -07:00
297cd93658
Merge changes I66e40b4b,I599a2ff9,I7c210623
am: 7b0604a191

Change-Id: Iba4bb6d1676d889f1e4a781a7970f01c0e321275

Chalard Jean   authored and   android-build-merger   commited 2018-10-16 09:14:22 -07:00
2a01b50b17
Merge changes I66e40b4b,I599a2ff9,I7c210623
* changes:
  [PT16] Simplification of sendProxyBroadcast.
  [PT15] Tiny bugfix in setGlobalProxy
  [PT14] No-op refactoring of sendProxyBroadcast

Treehugger Robot   authored and   Gerrit Code Review   commited 2018-10-16 14:48:33 +00:00
7b0604a191
Merge "Network-related commands porting" am: f1b3ef44bc
am: cb8425b803

Change-Id: I957050b73afed3e6fde908883568b81198310622

Luke Huang   authored and   android-build-merger   commited 2018-10-16 02:19:35 -07:00
69c6ff7627
Merge "Network-related commands porting"
am: f1b3ef44bc

Change-Id: I96b2bb80cca6e9d80f3f0fe08f7b71ce31b67528

Luke Huang   authored and   android-build-merger   commited 2018-10-16 01:09:30 -07:00
cb8425b803
Merge "Network-related commands porting"
Luke Huang   authored and   Gerrit Code Review   commited 2018-10-16 07:44:37 +00:00
f1b3ef44bc
[automerger skipped] Merge changes into stage-aosp-master
am: 8d8d06494a  -s ours

Change-Id: I14f88c998153e945516840acd7d3fbc765dd3357

chen xu   authored and   android-build-merger   commited 2018-10-15 16:12:40 -07:00
764c99a82d
[automerger skipped] Merge changes into stage-aosp-master
am: 8b21e345c6  -s ours

Change-Id: I00a27b03ba4c0061bce8c21940abb517aecdc48f

chen xu   authored and   android-build-merger   commited 2018-10-15 16:08:29 -07:00
2872e81790
Merge changes into stage-aosp-master
Android Build Merger (Role)   authored and   Android (Google) Code Review   commited 2018-10-15 22:44:53 +00:00
8d8d06494a
Merge changes into stage-aosp-master
Android Build Merger (Role)   authored and   Android (Google) Code Review   commited 2018-10-15 22:44:53 +00:00
8b21e345c6
Merge "Change permissions checks for setAirplaneMode." am: 7b81c459ce
am: 001a9fdc97

Change-Id: Ibe5bbd51adae83e1bfb5a4ab43d29eb2ccd02a8b

Lorenzo Colitti   authored and   android-build-merger   commited 2018-10-15 08:29:00 -07:00
141332c0a9
Merge changes into stage-aosp-master
am: b80a28b66d

Change-Id: Ifada0acd374477fc5ecddd7bed8c4dc800cf5fb4

Edward Savage-Jones   authored and   android-build-merger   commited 2018-10-15 08:17:49 -07:00
c131f57d8c
Merge changes into stage-aosp-master
am: 7324d048a3

Change-Id: I821951d01aed73f23ace36870362eb0ef875532f

Beverly Tai   authored and   android-build-merger   commited 2018-10-15 08:13:53 -07:00
b10781b22c
Merge "Change permissions checks for setAirplaneMode."
am: 7b81c459ce

Change-Id: I578923c3f9012055f715e536f5d4d42ed669c5ee

Lorenzo Colitti   authored and   android-build-merger   commited 2018-10-15 08:03:52 -07:00
001a9fdc97
Merge changes into stage-aosp-master
Android Build Merger (Role)   authored and   Android (Google) Code Review   commited 2018-10-15 15:00:04 +00:00
b80a28b66d
Merge changes into stage-aosp-master
Android Build Merger (Role)   authored and   Android (Google) Code Review   commited 2018-10-15 15:00:04 +00:00
7324d048a3
Merge "Change permissions checks for setAirplaneMode."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2018-10-15 13:36:45 +00:00
7b81c459ce
[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

Chalard Jean   commited 2018-10-15 12:58:41 +09:00
07c5bab28d
[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

Chalard Jean   commited 2018-10-15 12:58:41 +09:00
9be9a4b6ef
[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

Chalard Jean   commited 2018-10-15 12:58:40 +09:00
221019a4c6
Merge "[PT13] Simple cleanup of ProxyTracker." am: d4436ad912
am: 1030161630

Change-Id: I1e643d5be6d7f791c3bbe3ba018e6ad6717e3ddb

Chalard Jean   authored and   android-build-merger   commited 2018-10-12 01:12:12 -07:00
41c8399aa1
Merge "[PT13] Simple cleanup of ProxyTracker."
am: d4436ad912

Change-Id: I6a30f78e517716ca3ff14a3601374fddc65e4aec

Chalard Jean   authored and   android-build-merger   commited 2018-10-12 00:50:29 -07:00
1030161630
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

Lorenzo Colitti   commited 2018-10-12 16:35:46 +09:00
c4d0186b30
Merge "[PT13] Simple cleanup of ProxyTracker."
Chalard Jean   authored and   Gerrit Code Review   commited 2018-10-12 07:34:43 +00:00
d4436ad912
Merge "[PT12] Factor some code into ProxyTracker." am: 3da2ff5864
am: 2e9029e658

Change-Id: Ib4509788887df4c5c2ef017eb808a38dea0ae00b

Chalard Jean   authored and   android-build-merger   commited 2018-10-11 23:10:48 -07:00
1e24e9d6bc
Merge "[PT12] Factor some code into ProxyTracker."
am: 3da2ff5864

Change-Id: Ib92107f434576d8296ba74aab0d9abfe56cefa7c

Chalard Jean   authored and   android-build-merger   commited 2018-10-11 22:55:28 -07:00
2e9029e658
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

Yuuki Habu   commited 2018-10-12 14:35:30 +09:00
f7b0625dd7
Merge "[PT12] Factor some code into ProxyTracker."
Chalard Jean   authored and   Gerrit Code Review   commited 2018-10-12 04:23:16 +00:00
3da2ff5864
Merge "Add log for debugging ConnectivityManager" am: d3a9f1081a
am: de3f1c804e

Change-Id: I2d8604c172b26e474050afd45fba74dc6c2c18bc

Chalard Jean   authored and   android-build-merger   commited 2018-10-11 21:21:45 -07:00
2a1eb22753
Merge "Add log for debugging ConnectivityManager"
am: d3a9f1081a

Change-Id: I666e534f42a930a2d0fee55032d7a9e4516349c0

Chalard Jean   authored and   android-build-merger   commited 2018-10-11 21:11:51 -07:00
de3f1c804e
Merge "Add log for debugging ConnectivityManager"
Chalard Jean   authored and   Gerrit Code Review   commited 2018-10-12 03:14:48 +00:00
d3a9f1081a
Merge changes into stage-aosp-master
am: 68becced97

Change-Id: Iee2f5645cbe6122eececc1f0517175daa5b414ed

Andreas Gampe   authored and   android-build-merger   commited 2018-10-11 09:18:51 -07:00
f03443ba31
Merge changes into stage-aosp-master
am: c8b1e24b9b

Change-Id: Ic989692175b2763d58d3cbc169919ee24d2ba2d0

Andreas Gampe   authored and   android-build-merger   commited 2018-10-11 09:13:43 -07:00
a53b461136