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

Commit 0be19728 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch 'microg-upstream' into 'master' 

GmsCore: Update to 'v0.2.22.212658' tag

See merge request e/apps/GmsCore!35
parents 02a281d9 5ee9cc66

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ def execResult(...args) { 
    return stdout.toString().trim()

}



def gmsVersion = "21.21.58"

def gmsVersion = "21.26.58"

def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))

def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0', '--match=v[0-9]*').substring(1)

def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD"))

firebase-auth-api/src/main/aidl/com/google/firebase/auth/api/internal/IFirebaseAuthCallbacks.aidl

+11 −11
Original line number Diff line number Diff line
@@ -8,15 +8,15 @@ import com.google.firebase.auth.api.internal.GetTokenResponse; 
import com.google.firebase.auth.api.internal.ResetPasswordResponse;



interface IFirebaseAuthCallbacks {

    void onGetTokenResponse(in GetTokenResponse response) = 0;

    void onGetTokenResponseAndUser(in GetTokenResponse response, in GetAccountInfoUser user) = 1;

    void onCreateAuthUriResponse(in CreateAuthUriResponse response) = 2;

    void onResetPasswordResponse(in ResetPasswordResponse response) = 3;

    void onFailure(in Status status) = 4;

    void onDeleteAccountResponse() = 5;

    void onEmailVerificationResponse() = 6;



    void onSendVerificationCodeResponse(String sessionInfo) = 8;

    void onVerificationCompletedResponse(in PhoneAuthCredential credential) = 9;

    void onVerificationAutoTimeOut(String sessionInfo) = 10;

    oneway void onGetTokenResponse(in GetTokenResponse response) = 0;

    oneway void onGetTokenResponseAndUser(in GetTokenResponse response, in GetAccountInfoUser user) = 1;

    oneway void onCreateAuthUriResponse(in CreateAuthUriResponse response) = 2;

    oneway void onResetPasswordResponse(in ResetPasswordResponse response) = 3;

    oneway void onFailure(in Status status) = 4;

    oneway void onDeleteAccountResponse() = 5;

    oneway void onEmailVerificationResponse() = 6;

    //oneway void onSetAccountInfo(String s) = 7

    oneway void onSendVerificationCodeResponse(String sessionInfo) = 8;

    oneway void onVerificationCompletedResponse(in PhoneAuthCredential credential) = 9;

    oneway void onVerificationAutoTimeOut(String sessionInfo) = 10;

}

play-services-api/src/main/aidl/com/google/android/gms/clearcut/internal/IClearcutLoggerCallbacks.aidl

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ package com.google.android.gms.clearcut.internal; 
import com.google.android.gms.common.api.Status;



interface IClearcutLoggerCallbacks {

    void onStatus(in Status status) = 0;

    oneway void onStatus(in Status status) = 0;

}

play-services-api/src/main/aidl/com/google/android/gms/phenotype/internal/IPhenotypeCallbacks.aidl

+2 −2
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ import com.google.android.gms.common.api.Status; 
import com.google.android.gms.phenotype.Configurations;



interface IPhenotypeCallbacks {

    void onRegister(in Status status) = 0;

    void onConfigurations(in Status status, in Configurations configurations) = 3;

    oneway void onRegister(in Status status) = 0;

    oneway void onConfigurations(in Status status, in Configurations configurations) = 3;

}

play-services-api/src/main/aidl/com/google/android/gms/safetynet/internal/ISafetyNetCallbacks.aidl

+8 −8
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ import com.google.android.gms.safetynet.RemoveHarmfulAppData; 
import com.google.android.gms.safetynet.SafeBrowsingData;



interface ISafetyNetCallbacks {

    void onAttestationData(in Status status, in AttestationData attestationData) = 0;

    void onString(String s) = 1;

    void onSafeBrowsingData(in Status status, in SafeBrowsingData safeBrowsingData) = 2;

    void onBoolean(in Status status, boolean b) = 3;

    void onHarmfulAppsData(in Status status, in List<HarmfulAppsData> harmfulAppsData) = 4;

    void onRecaptchaResult(in Status status, in RecaptchaResultData recaptchaResultData) = 5;

    void onHarmfulAppsInfo(in Status status, in HarmfulAppsInfo harmfulAppsInfo) = 7;

    void onRemoveHarmfulAppData(in Status status, in RemoveHarmfulAppData removeHarmfulAppData) = 14;

    oneway void onAttestationData(in Status status, in AttestationData attestationData) = 0;

    oneway void onString(String s) = 1;

    oneway void onSafeBrowsingData(in Status status, in SafeBrowsingData safeBrowsingData) = 2;

    oneway void onBoolean(in Status status, boolean b) = 3;

    oneway void onHarmfulAppsData(in Status status, in List<HarmfulAppsData> harmfulAppsData) = 4;

    oneway void onRecaptchaResult(in Status status, in RecaptchaResultData recaptchaResultData) = 5;

    oneway void onHarmfulAppsInfo(in Status status, in HarmfulAppsInfo harmfulAppsInfo) = 7;

    oneway void onRemoveHarmfulAppData(in Status status, in RemoveHarmfulAppData removeHarmfulAppData) = 14;

}