summaryrefslogtreecommitdiff
path: root/src/network/android
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Update commercial license headers to src/dbus, src/gui, src/network"Tarja Sundqvist2021-03-221-21/+21
| | | | | | | | | | | This reverts commit 897645d417c445f19ee183147c61e1bd0694868f. Revert of commercial license header changes is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I4b21b5e105d34dc076a5ffad1a6d3b2793c2f163 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update commercial license headers to src/dbus, src/gui, src/networkTarja Sundqvist2021-01-281-21/+21
| | | | | | | | | | | | | | | | Updated header.COMM to files in tqtc-qtbase/src/dbus, tqtc-qtbase/src/gui and tqtc-qtbase/src/network. The documentation files were not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4154 Change-Id: Id2d3db63c1f378812d8058fa8a118702a5829eb8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix exception with Android 5.xAndré Klitzing2020-12-031-1/+2
| | | | | | | | | | | | | | | ConnectivityManager#getDefaultProxy() is available in API Level 23. No pending exception expected: java.lang.NoSuchMethodError: No virtual method getDefaultProxy()Landroid/net/ProxyInfo; in class Landroid/net/ConnectivityManager; or its super classes (declaration of 'android.net.ConnectivityManager' appears in /system/framework/framework.jar) at android.net.ProxyInfo org.qtproject.qt5.android.network.QtNetwork.getProxyInfo(android.content.Context) (QtNetwork.java:98) at void org.qtproject.qt5.android.QtNative.startQtApplication() (QtNative.java:-2) at void org.qtproject.qt5.android.QtNative$7.run() (QtNative.java:620) at void org.qtproject.qt5.android.QtThread$1.run() (QtThread.java:61) at void java.lang.Thread.run() (Thread.java:831) Task-number: QTBUG-78812 Change-Id: I68c4cc97eea63eae53dfc2ee50bff658e5cd4a93 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Android: Add support for proxiesAndy Shaw2020-06-162-0/+116
Fixes: QTBUG-78812 Change-Id: Id1f35a5e4ca3d8841edae378df69b65ef599c1ca Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 68387e485c954d6db2cf423723883a0b6dae222c)