Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'sprint_delhi' into 'master' 

[RELEASE] Sprint delhi

See merge request e/apps/GmsCore!9
parents 7812282d 315ed122

play-services-core/src/main/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"

play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java

+2 −0
Original line number Diff line number Diff line
@@ -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) {