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

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

Fix merge mistakes

parent 9b502a89

.gitmodules

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
[submodule "extern/UnifiedNlp"]

	path = extern/UnifiedNlp

	url = https://gitlab.e.foundation/e/apps/android_packages_apps_UnifiedNlp

	branch = dev

[submodule "extern/GmsApi"]

	path = extern/GmsApi

	url = https://gitlab.e.foundation/e/apps/GmsApi

	branch = dev

[submodule "extern/Wearable"]

	path = extern/Wearable

	url = https://gitlab.e.foundation/e/apps/Wearable

	branch = dev

[submodule "extern/GmsLib"]

	path = extern/GmsLib

	url = https://gitlab.e.foundation/e/apps/GmsLib

	branch = dev

[submodule "extern/RemoteDroidGuard"]

	path = extern/RemoteDroidGuard

	url = https://gitlab.e.foundation/e/apps/android_packages_apps_RemoteDroidGuard

	branch = dev

play-services-base-core/src/main/java/org/microg/gms/common/HttpFormClient.java

+0 −5
Original line number Diff line number Diff line
@@ -249,11 +249,6 @@ public class HttpFormClient { 
        public String value();

    }



    @Retention(RetentionPolicy.RUNTIME)

    @Target(ElementType.FIELD)

    public @interface RequestContentDynamic {

    }



    @Retention(RetentionPolicy.RUNTIME)

    @Target(ElementType.FIELD)

    public @interface ResponseHeader {

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

+1 −13
Original line number Diff line number Diff line
@@ -484,7 +484,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"
@@ -665,18 +665,6 @@ 
            </intent-filter>

        </service>



        <service android:name="org.microg.gms.appinvite.AppInviteService">

            <intent-filter>

                <action android:name="com.google.android.gms.appinvite.service.START"/>

            </intent-filter>

        </service>



        <service android:name="org.microg.gms.firebase.dynamiclinks.DynamicLinksService">

            <intent-filter>

                <action android:name="com.google.firebase.dynamiclinks.service.START"/>

            </intent-filter>

        </service>



        <service android:name="org.microg.gms.DummyService">

            <intent-filter>

                <action android:name="com.google.android.gms.plus.service.START" />

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

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

play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ import org.microg.gms.checkin.CheckinManager; 
import org.microg.gms.checkin.LastCheckinInfo;

import org.microg.gms.common.HttpFormClient;

import org.microg.gms.common.Utils;

import org.microg.gms.gcm.McsService;

import org.microg.gms.people.PeopleManager;



import java.io.IOException;
@@ -359,7 +358,6 @@ public class LoginActivity extends AssistantActivity { 
    private boolean checkin(boolean force) {

        try {

            CheckinManager.checkin(LoginActivity.this, force);

            McsService.scheduleReconnect(this);

            return true;

        } catch (IOException e) {

            Log.w(TAG, "Checkin failed", e);