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
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
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
Android Build Merger (Role)
c9fae266fb
Merge changes into stage-aosp-master
2018-10-11 15:45:44 +00:00
Android Build Merger (Role)
f4bd5dd297
Merge changes into stage-aosp-master
2018-10-11 15:45:44 +00:00
Chalard Jean
bca532143c
Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker" am: 782db99fa1 am: 1c4c870faf
...
am: b63c1baea4
Change-Id: Ic2f23e9690ada55bb666ca6e88517b68f2e9cb88
2018-10-11 07:06:43 -07:00
Chalard Jean
b63c1baea4
Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker" am: 782db99fa1
...
am: 1c4c870faf
Change-Id: Idbb16f8ae3b35f22cbef254c5f20aaf989acaab9
2018-10-11 06:48:47 -07:00
Chalard Jean
1c4c870faf
Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker"
...
am: 782db99fa1
Change-Id: I91e1a230864f0d5d826c01f91918a35461e2a433
2018-10-11 06:36:29 -07:00
Treehugger Robot
782db99fa1
Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker"
2018-10-11 12:50:17 +00:00
Lorenzo Colitti
5ea1a81e4b
Merge "Make setAirplaneMode @SystemApi for SetupWizard." am: 772b75c26d am: c37dffde10
...
am: ff944740c3
Change-Id: I994f0ff3ad9a3833eb56da7614e3632452d5c476
2018-10-10 23:32:45 -07:00
Lorenzo Colitti
ff944740c3
Merge "Make setAirplaneMode @SystemApi for SetupWizard." am: 772b75c26d
...
am: c37dffde10
Change-Id: I8049e2484526104eba7fad92d2819eb94319fa84
2018-10-10 20:26:35 -07:00
Lorenzo Colitti
c37dffde10
Merge "Make setAirplaneMode @SystemApi for SetupWizard."
...
am: 772b75c26d
Change-Id: Ib418ca0a9f8d9be9c4bdc419c9d2ed05aa47a49d
2018-10-10 20:14:03 -07:00
Lorenzo Colitti
0bfef02a24
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
b8102ef4d7
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
5c3f5e7484
Merge changes I10c01f2b,Ie05bc535 am: 90a0bdb98a am: e09f9d1a93
...
am: 51d3eded50
Change-Id: I074056f861332835adaed32ad7d43ed36667ffa3
2018-10-05 12:35:56 -07:00
Igor Murashkin
c25f790c44
Merge changes into stage-aosp-master am: b8480d5bda
...
am: 10cd239a14
Change-Id: I89aab101881f2b1d835c8c8814336e714fa9ab17
2018-10-05 12:17:40 -07:00
Yan Yan
51d3eded50
Merge changes I10c01f2b,Ie05bc535 am: 90a0bdb98a
...
am: e09f9d1a93
Change-Id: I5501ba7eb04493b5de84feaeadb53b57de89e8d2
2018-10-05 12:13:20 -07:00
Igor Murashkin
5ef32c9748
Merge changes into stage-aosp-master am: 8b2dc0adc6
...
am: e0065199ea
Change-Id: Ib857b990a0938889b134228d78a32398a72be102
2018-10-05 12:12:17 -07:00
Igor Murashkin
10cd239a14
Merge changes into stage-aosp-master
...
am: b8480d5bda
Change-Id: I2aac3fb3b6fa638e9c0cc871a02216ed498df98d
2018-10-05 11:57:18 -07:00
Igor Murashkin
e0065199ea
Merge changes into stage-aosp-master
...
am: 8b2dc0adc6
Change-Id: I63acb13055109fc08fbe77d4dd6ebd68daeaabcd
2018-10-05 11:50:43 -07:00
Yan Yan
e09f9d1a93
Merge changes I10c01f2b,Ie05bc535
...
am: 90a0bdb98a
Change-Id: I2e55a266f65268ca734c028d4da7add14a281d75
2018-10-05 11:47:12 -07:00
Yan Yan
90a0bdb98a
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)
b8480d5bda
Merge changes into stage-aosp-master
2018-10-05 17:35:26 +00:00
Android Build Merger (Role)
8b2dc0adc6
Merge changes into stage-aosp-master
2018-10-05 17:35:26 +00:00
Chalard Jean
b3834652f8
Merge "[PT10] Move loadGlobalProxy into ProxyTracker." am: 79822ffb6f am: fa17d29fa9
...
am: b3ba9ff8ab
Change-Id: I593f1987170b279d57e8d18c380c1f16855f9206
2018-10-05 02:45:09 -07:00
Chalard Jean
b3ba9ff8ab
Merge "[PT10] Move loadGlobalProxy into ProxyTracker." am: 79822ffb6f
...
am: fa17d29fa9
Change-Id: I4220b1964040affa39d8d748095a161b2512eccf
2018-10-05 02:33:45 -07:00