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

Commit 490a39a8 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge remote-tracking branch 'upstream/master'

parents 485a35f7 93c1e0f2

build.gradle

+9 −1
Original line number Diff line number Diff line
@@ -37,6 +37,14 @@ buildscript { 
    ext.androidTargetSdk = 29

    ext.androidCompileSdk = 33



    ext.localProperties = new Properties()



    try {

        ext.localProperties.load(rootProject.file('local.properties').newDataInputStream())

    } catch (ignored) {

        // Ignore

    }



    repositories {

        mavenCentral()

        google()
@@ -60,7 +68,7 @@ def execResult(...args) { 
    return stdout.toString()

}



def gmsVersion = "22.36.16"

def gmsVersion = "23.16.57"

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

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

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

firebase-auth/core/src/main/kotlin/org/microg/gms/firebase/auth/IdentityToolkitClient.kt

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class IdentityToolkitClient(context: Context, private val apiKey: String) { 
        queue.add(JsonObjectRequest(POST, buildRelyingPartyUrl(method), data, {

            continuation.resume(it)

        }, {

            Log.d(TAG, String(it.networkResponse.data))

            Log.d(TAG, "Error: ${it.networkResponse?.data?.decodeToString() ?: it.message}")

            continuation.resumeWithException(RuntimeException(it))

        }))

    }

play-services-api/src/main/java/com/google/android/gms/measurement/internal/AppMetadata.java

+19 −11
Original line number Diff line number Diff line
@@ -19,27 +19,27 @@ public class AppMetadata extends AutoSafeParcelable { 
    @Field(5)

    public String installerPackageName;

    @Field(6)

    private long field6;

    private long googleVersion;

    @Field(7)

    private long field7;

    private long devCertHash;

    @Field(8)

    private String field8;

    private String healthMonitor;

    @Field(9)

    private boolean field9 = true;

    private boolean measurementEnabled = true;

    @Field(10)

    private boolean field10;

    private boolean firstOpen;

    @Field(11)

    public long versionCode = Integer.MIN_VALUE;

    @Field(12)

    private String field12;

    private String firebaseInstanceId;

    @Field(13)

    private long field13;

    private long androidId;

    @Field(14)

    private long field14;

    private long instantiationTime;

    @Field(15)

    public int appType;

    @Field(16)

    private boolean field16;

    private boolean adIdReportingEnabled;

    @Field(17)

    public boolean ssaidCollectionEnabled = true;

    @Field(18)
@@ -49,13 +49,21 @@ public class AppMetadata extends AutoSafeParcelable { 
    @Field(21)

    public Boolean allowAdPersonalization;

    @Field(22)

    private long field22;

    private long dynamiteVersion;

    @Field(23)

    public List<String> safelistedEvents;

    @Field(24)

    public String gaAppId;

    @Field(25)

    private String field25;

    private String consentSettings;

    @Field(26)

    private String ephemeralAppInstanceId;

    @Field(27)

    private String sessionStitchingToken;

    @Field(28)

    private boolean sgtmUploadEnabled;

    @Field(29)

    private long targetOsVersion;



    public String toString() {

        return "AppMetadata[" + packageName + "]";

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

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ public class PackageUtils { 
        if (suggestedCallerPid > 0 && suggestedCallerPid != callingPid) {

            throw new SecurityException("suggested PID [" + suggestedCallerPid + "] and real calling PID [" + callingPid + "] mismatch!");

        }

        return getAndCheckPackage(context, suggestedPackageName, callingUid, Binder.getCallingPid());

        return getAndCheckPackage(context, suggestedPackageName, callingUid, callingPid);

    }



    @Nullable

play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt

+16 −0
Original line number Diff line number Diff line
@@ -145,6 +145,22 @@ object SettingsContract { 
        )

    }



    object Location {

        private const val id = "location"

        fun getContentUri(context: Context) = Uri.withAppendedPath(getAuthorityUri(context), id)

        fun getContentType(context: Context) = "vnd.android.cursor.item/vnd.${getAuthority(context)}.$id"



        const val WIFI_MLS = "location_wifi_mls"

        const val WIFI_MOVING = "location_wifi_moving"

        const val CELL_MLS = "location_cell_mls"



        val PROJECTION = arrayOf(

            WIFI_MLS,

            WIFI_MOVING,

            CELL_MLS

        )

    }



    private fun <T> withoutCallingIdentity(f: () -> T): T {

        val identity = Binder.clearCallingIdentity()

        try {