TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-16 06:45:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'john/master' into development

Browse Source 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt
#	app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
#	app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
This commit is contained in:
Viktor De Pasquale
2019-05-13 16:50:08 +02:00
parent 0850401dc4 80cd85b061
commit 80855e89ec
22 changed files with 147 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/src/main/java/com/topjohnwu/net/Networking.java
View File

@@ -44,7 +44,7 @@ public class Networking {
gms.getClassLoader()
.loadClass("com.google.android.gms.common.security.ProviderInstallerImpl")
.getMethod("insertProvider", Context.class)
.invoke(null, context);
.invoke(null, gms);
} catch (Exception e) {
// Failed to update SSL provider, use NoSSLv3SocketFactory on SDK < 21
if (Build.VERSION.SDK_INT < 21)