Commit Graph

5346 Commits

Author SHA1 Message Date
Lorenzo Colitti
e23d829d66 Merge "Change permissions checks for setAirplaneMode." am: 7b81c459ce am: 001a9fdc97
am: 141332c0a9

Change-Id: Icfc55aefa11a5e1dd92382c2be94c7b63889aa8f
2018-10-15 08:49:52 -07:00
Edward Savage-Jones
229438eb25 Merge changes into stage-aosp-master am: b80a28b66d
am: c131f57d8c

Change-Id: I35976332f9bdec9d45e4e35980eaefeebad4ca4a
2018-10-15 08:42:40 -07:00
Beverly Tai
5ce3de6d86 Merge changes into stage-aosp-master am: 7324d048a3
am: b10781b22c

Change-Id: Iba66577f1e3c5c952c6ab3a6eb0d74160f280bf6
2018-10-15 08:37:09 -07:00
Lorenzo Colitti
141332c0a9 Merge "Change permissions checks for setAirplaneMode." am: 7b81c459ce
am: 001a9fdc97

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

Change-Id: Ifada0acd374477fc5ecddd7bed8c4dc800cf5fb4
2018-10-15 08:17:49 -07:00
Beverly Tai
b10781b22c Merge changes into stage-aosp-master
am: 7324d048a3

Change-Id: I821951d01aed73f23ace36870362eb0ef875532f
2018-10-15 08:13:53 -07:00
Lorenzo Colitti
001a9fdc97 Merge "Change permissions checks for setAirplaneMode."
am: 7b81c459ce

Change-Id: I578923c3f9012055f715e536f5d4d42ed669c5ee
2018-10-15 08:03:52 -07:00
Android Build Merger (Role)
b80a28b66d Merge changes into stage-aosp-master 2018-10-15 15:00:04 +00:00
Android Build Merger (Role)
7324d048a3 Merge changes into stage-aosp-master 2018-10-15 15:00:04 +00:00
Lorenzo Colitti
7b81c459ce Merge "Change permissions checks for setAirplaneMode." 2018-10-15 13:36:45 +00:00
Chalard Jean
fcfb9e490c Merge "[PT13] Simple cleanup of ProxyTracker." am: d4436ad912 am: 1030161630
am: 41c8399aa1

Change-Id: I38c35b61b3d50ac320c0aa036c4886c523e27a90
2018-10-12 01:22:20 -07:00
Chalard Jean
41c8399aa1 Merge "[PT13] Simple cleanup of ProxyTracker." am: d4436ad912
am: 1030161630

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

Change-Id: I6a30f78e517716ca3ff14a3601374fddc65e4aec
2018-10-12 00:50:29 -07:00
Lorenzo Colitti
c4d0186b30 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
d4436ad912 Merge "[PT13] Simple cleanup of ProxyTracker." 2018-10-12 07:34:43 +00:00
Chalard Jean
9d539f6789 Merge "[PT12] Factor some code into ProxyTracker." am: 3da2ff5864 am: 2e9029e658
am: 1e24e9d6bc

Change-Id: I8053a79146621f4e9f29fee42ebb7b6d247356ed
2018-10-11 23:26:37 -07:00
Chalard Jean
1e24e9d6bc Merge "[PT12] Factor some code into ProxyTracker." am: 3da2ff5864
am: 2e9029e658

Change-Id: Ib4509788887df4c5c2ef017eb808a38dea0ae00b
2018-10-11 23:10:48 -07:00
Chalard Jean
2e9029e658 Merge "[PT12] Factor some code into ProxyTracker."
am: 3da2ff5864

Change-Id: Ib92107f434576d8296ba74aab0d9abfe56cefa7c
2018-10-11 22:55:28 -07:00
Chalard Jean
ad7dc323d2 Merge "Add log for debugging ConnectivityManager" am: d3a9f1081a am: de3f1c804e
am: 2a1eb22753

Change-Id: I23a34c21d05db126d8d2aacdeb700b3d2b2ed018
2018-10-11 21:29:52 -07:00
Chalard Jean
3da2ff5864 Merge "[PT12] Factor some code into ProxyTracker." 2018-10-12 04:23:16 +00:00
Chalard Jean
2a1eb22753 Merge "Add log for debugging ConnectivityManager" am: d3a9f1081a
am: de3f1c804e

Change-Id: I2d8604c172b26e474050afd45fba74dc6c2c18bc
2018-10-11 21:21:45 -07:00
Chalard Jean
de3f1c804e Merge "Add log for debugging ConnectivityManager"
am: d3a9f1081a

Change-Id: I666e534f42a930a2d0fee55032d7a9e4516349c0
2018-10-11 21:11:51 -07:00
Chalard Jean
d3a9f1081a Merge "Add log for debugging ConnectivityManager" 2018-10-12 03:14:48 +00:00
Andreas Gampe
a6df881653 Merge changes into stage-aosp-master am: 68becced97
am: f03443ba31

Change-Id: I33046e52ac1c59f755ef30cbf39203d914ed77c6
2018-10-11 09:32:42 -07:00
Andreas Gampe
c9e627c2ea Merge changes into stage-aosp-master am: c8b1e24b9b
am: a53b461136

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

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

Change-Id: Ic989692175b2763d58d3cbc169919ee24d2ba2d0
2018-10-11 09:13:43 -07:00
Android Build Merger (Role)
68becced97 Merge changes into stage-aosp-master 2018-10-11 15:45:44 +00:00
Android Build Merger (Role)
c8b1e24b9b Merge changes into stage-aosp-master 2018-10-11 15:45:44 +00:00
Chalard Jean
a07ae038c1 Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker" am: 3bc52ec6f6 am: 4a4a900999
am: 3a9dc1f5f7

Change-Id: Ic2f23e9690ada55bb666ca6e88517b68f2e9cb88
2018-10-11 07:06:43 -07:00
Chalard Jean
3a9dc1f5f7 Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker" am: 3bc52ec6f6
am: 4a4a900999

Change-Id: Idbb16f8ae3b35f22cbef254c5f20aaf989acaab9
2018-10-11 06:48:47 -07:00
Chalard Jean
4a4a900999 Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker"
am: 3bc52ec6f6

Change-Id: I91e1a230864f0d5d826c01f91918a35461e2a433
2018-10-11 06:36:29 -07:00
Treehugger Robot
3bc52ec6f6 Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker" 2018-10-11 12:50:17 +00:00
Lorenzo Colitti
22df18f4fc Merge "Make setAirplaneMode @SystemApi for SetupWizard." am: 772b75c26d am: 27d5da4b3c
am: 6bc642d6d7

Change-Id: I994f0ff3ad9a3833eb56da7614e3632452d5c476
2018-10-10 23:32:45 -07:00
Lorenzo Colitti
6bc642d6d7 Merge "Make setAirplaneMode @SystemApi for SetupWizard." am: 772b75c26d
am: 27d5da4b3c

Change-Id: I8049e2484526104eba7fad92d2819eb94319fa84
2018-10-10 20:26:35 -07:00
Lorenzo Colitti
27d5da4b3c Merge "Make setAirplaneMode @SystemApi for SetupWizard."
am: 772b75c26d

Change-Id: Ib418ca0a9f8d9be9c4bdc419c9d2ed05aa47a49d
2018-10-10 20:14:03 -07:00
Lorenzo Colitti
272a77dd9a Make setAirplaneMode @SystemApi for SetupWizard.
Expose ConnectivityManager#setAirplaneMode and the
NETWORK_SETUP_WIZARD permission so that SetupWizard can call
setAirplaneMode.

Delete setAirplaneMode from the greylist because the permissions
checks on it, since at least 2013, have been for a privileged
permission (CONNECTIVITY_INTERNAL) that normal apps don't have.

Test: m
Bug: 115302596
Change-Id: I28f24d32c4b4b386407e9e0e3514ea9f8854f4a8
2018-10-10 17:50:05 +09:00
Soi, Yoshinari
99efcbd08b Add log for debugging ConnectivityManager
Add log to ConnectivityManager for better investigations of issue.
This patch adds StackTrace to the following APIs.

reportInetCondition()
reportBadNetwork()
reportNetworkConnectivity()
sendRequestForNetwork()
requestNetwork()
releaseNetworkRequest()
registerNetworkCallback()
unregisterNetworkCallback()

Bug: 116751720
Change-Id: I992292cd9d6f3d69c91ddbde5577591f9ec0f39b
2018-10-10 11:56:04 +09:00
Yan Yan
bd9217ff0c Merge changes I10c01f2b,Ie05bc535 am: c182d29130 am: bd45a0d77f
am: 8210690538

Change-Id: I074056f861332835adaed32ad7d43ed36667ffa3
2018-10-05 12:35:56 -07:00
Igor Murashkin
711df34d7b Merge changes into stage-aosp-master am: 57ff7edf69
am: 384127ccfe

Change-Id: I89aab101881f2b1d835c8c8814336e714fa9ab17
2018-10-05 12:17:40 -07:00
Yan Yan
8210690538 Merge changes I10c01f2b,Ie05bc535 am: c182d29130
am: bd45a0d77f

Change-Id: I5501ba7eb04493b5de84feaeadb53b57de89e8d2
2018-10-05 12:13:20 -07:00
Igor Murashkin
0d8926285b Merge changes into stage-aosp-master am: 526ef90850
am: 7240b9200f

Change-Id: Ib857b990a0938889b134228d78a32398a72be102
2018-10-05 12:12:17 -07:00
Igor Murashkin
384127ccfe Merge changes into stage-aosp-master
am: 57ff7edf69

Change-Id: I2aac3fb3b6fa638e9c0cc871a02216ed498df98d
2018-10-05 11:57:18 -07:00
Igor Murashkin
7240b9200f Merge changes into stage-aosp-master
am: 526ef90850

Change-Id: I63acb13055109fc08fbe77d4dd6ebd68daeaabcd
2018-10-05 11:50:43 -07:00
Yan Yan
bd45a0d77f Merge changes I10c01f2b,Ie05bc535
am: c182d29130

Change-Id: I2e55a266f65268ca734c028d4da7add14a281d75
2018-10-05 11:47:12 -07:00
Yan Yan
c182d29130 Merge changes I10c01f2b,Ie05bc535
* changes:
  Check to ensure UDP-encap is used only for IPv4
  Add UDP encapsulation tests for IpSecService.
2018-10-05 17:38:41 +00:00
Android Build Merger (Role)
57ff7edf69 Merge changes into stage-aosp-master 2018-10-05 17:35:26 +00:00
Android Build Merger (Role)
526ef90850 Merge changes into stage-aosp-master 2018-10-05 17:35:26 +00:00
Chalard Jean
330e1850b6 Merge "[PT10] Move loadGlobalProxy into ProxyTracker." am: 79822ffb6f am: c75b9031f5
am: a81b647e09

Change-Id: I593f1987170b279d57e8d18c380c1f16855f9206
2018-10-05 02:45:09 -07:00
Chalard Jean
a81b647e09 Merge "[PT10] Move loadGlobalProxy into ProxyTracker." am: 79822ffb6f
am: c75b9031f5

Change-Id: I4220b1964040affa39d8d748095a161b2512eccf
2018-10-05 02:33:45 -07:00