Commit d20d93a9 authored by Romain Hunault's avatar Romain Hunault
Browse files

Merge branch 'sprint_delhi' into 'master'

[RELEASE] Sprint delhi

See merge request !9
parents 7812282d 315ed122
Pipeline #37649 passed with stage
in 7 minutes and 3 seconds
......@@ -441,7 +441,7 @@
</activity>
<!-- microG Settings embedded in System Settings on SDK 23 and newer -->
<activity-alias
<!--<activity-alias
android:name="org.microg.gms.ui.SettingsActivityLink"
android:icon="@drawable/microg_light_color_24"
android:label="@string/gms_settings_name"
......@@ -460,7 +460,7 @@
<meta-data
android:name="com.android.settings.summary"
android:resource="@string/gms_settings_summary"/>
</activity-alias>
</activity-alias> -->
<activity
android:name="org.microg.gms.ui.AskPushPermission"
......
......@@ -46,6 +46,8 @@ import javax.net.ssl.SSLContext;
public class ProviderInstallerImpl {
private static final String TAG = "GmsProviderInstaller";
//private static final List<String> DISABLED = Collections.singletonList("com.discord");
private static final List<String> DISABLED = Collections.unmodifiableList(Arrays.asList("com.discord", "com.bankid.bus"));
public static void insertProvider(Context context) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment