Merge branch 'microg:master' into patch-work-account

README.md

@@ -9,7 +9,7 @@ microG Services is a FLOSS (Free/Libre Open Source Software) framework to allow
 
 License
 -------
-    Copyright 2013-2023 microG Project Team
+    Copyright 2013-2024 microG Project Team
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

fake-signature/src/huawei/java/com/huawei/signature/diff/SignatureService.java

@@ -64,7 +64,7 @@ protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
 
         @Override
         public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException {
-            if (Binder.getCallingPid() > 10000) {
+            if (Binder.getCallingUid() > 10000) {
                 Log.w(TAG, "Illegal access from app");
                 reply.writeException(new UnsupportedOperationException("Illegal"));
                 return true;

play-services-api/build.gradle

@@ -41,4 +41,6 @@ android {
 dependencies {
     api project(':play-services-base')
     api project(':play-services-phenotype')
+
+    annotationProcessor project(':safe-parcel-processor')
 }

play-services-api/src/main/aidl/com/google/android/gms/audit/LogAuditRecordsRequest.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.audit;
+
+parcelable LogAuditRecordsRequest;

play-services-api/src/main/aidl/com/google/android/gms/audit/internal/IAuditService.aidl

@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.audit.internal;
+
+import com.google.android.gms.common.api.internal.IStatusCallback;
+import com.google.android.gms.audit.LogAuditRecordsRequest;
+
+interface IAuditService {
+    void logAuditRecords(in LogAuditRecordsRequest request, IStatusCallback callback);
+}

play-services-api/src/main/aidl/com/google/android/gms/gass/internal/GassRequestParcel.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.gass.internal;
+
+parcelable GassRequestParcel;

play-services-api/src/main/aidl/com/google/android/gms/gass/internal/GassResponseParcel.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.gass.internal;
+
+parcelable GassResponseParcel;

play-services-api/src/main/aidl/com/google/android/gms/gass/internal/IGassService.aidl

@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.gass.internal;
+
+import android.os.Bundle;
+import android.os.IInterface;
+import com.google.android.gms.gass.internal.GassRequestParcel;
+import com.google.android.gms.gass.internal.GassResponseParcel;
+
+interface IGassService {
+    GassResponseParcel getGassResponse(in GassRequestParcel gassRequestParcel) = 0;
+    Bundle getGassBundle(in Bundle bundle, int code) = 3;
+}

play-services-api/src/main/aidl/com/google/android/gms/pseudonymous/PseudonymousIdToken.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.pseudonymous;
+
+parcelable PseudonymousIdToken;

play-services-api/src/main/aidl/com/google/android/gms/pseudonymous/internal/IPseudonymousIdCallbacks.aidl

@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.pseudonymous.internal;
+
+import com.google.android.gms.common.api.Status;
+import com.google.android.gms.pseudonymous.PseudonymousIdToken;
+
+interface IPseudonymousIdCallbacks {
+    void onGetTokenResponse(in Status status, in PseudonymousIdToken token) = 0;
+    void onSetTokenResponse(in Status status) = 1;
+    void onGetLastResetWallTimeMsResponse(in Status status, long time) = 2;
+}

play-services-api/src/main/aidl/com/google/android/gms/pseudonymous/internal/IPseudonymousIdService.aidl

@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.pseudonymous.internal;
+
+import com.google.android.gms.pseudonymous.internal.IPseudonymousIdCallbacks;
+import com.google.android.gms.pseudonymous.PseudonymousIdToken;
+
+interface IPseudonymousIdService {
+   void getToken(IPseudonymousIdCallbacks call) = 0;
+   void setToken(IPseudonymousIdCallbacks call, in PseudonymousIdToken token) = 1;
+   void getLastResetWallTimeMs(IPseudonymousIdCallbacks callbacks) = 2;
+}

play-services-api/src/main/aidl/com/google/android/gms/semanticlocation/SemanticLocationEventRequest.aidl

@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.google.android.gms.semanticlocation;
+
+parcelable SemanticLocationEventRequest;

play-services-api/src/main/aidl/com/google/android/gms/semanticlocation/internal/ISemanticLocationService.aidl

@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.google.android.gms.semanticlocation.internal;
+
+import android.app.PendingIntent;
+import android.os.IInterface;
+import com.google.android.gms.semanticlocation.SemanticLocationEventRequest;
+import com.google.android.gms.semanticlocation.internal.SemanticLocationParameters;
+import com.google.android.gms.common.api.internal.IStatusCallback;
+
+interface ISemanticLocationService {
+    void registerSemanticLocationEvents(in SemanticLocationParameters params, IStatusCallback callback, in SemanticLocationEventRequest request, in PendingIntent pendingIntent) = 0;
+    void unregisterSemanticLocationEvents(in SemanticLocationParameters params, IStatusCallback callback, in PendingIntent pendingIntent) = 1;
+
+    void setIncognitoMode(in SemanticLocationParameters params, IStatusCallback callback, boolean mode) = 4;
+}

play-services-api/src/main/aidl/com/google/android/gms/semanticlocation/internal/SemanticLocationParameters.aidl

@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.google.android.gms.semanticlocation.internal;
+
+parcelable SemanticLocationParameters;

play-services-api/src/main/java/com/google/android/gms/audit/LogAuditRecordsRequest.java

@@ -0,0 +1,53 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.audit;
+
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+
+import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+
+import org.microg.gms.utils.ToStringHelper;
+
+@SafeParcelable.Class
+public class LogAuditRecordsRequest extends AbstractSafeParcelable {
+    @Field(1)
+    public int writeMode;
+    @Field(2)
+    public int componentId;
+    @Field(3)
+    public String accountName;
+    @Field(4)
+    public byte[][] auditRecords;
+    @Field(5)
+    public byte[] traceToken;
+    @Field(6)
+    public byte[] auditToken;
+
+    @NonNull
+    @Override
+    public String toString() {
+        return ToStringHelper.name("LogAuditRecordsRequest")
+                .field("writeMode", writeMode)
+                .field("componentId", componentId)
+                .field("accountName", accountName)
+                .field("auditRecords", auditRecords)
+                .field("traceToken", traceToken)
+                .field("auditToken", auditToken)
+                .end();
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        CREATOR.writeToParcel(this, dest, flags);
+    }
+
+    public static final SafeParcelableCreatorAndWriter<LogAuditRecordsRequest> CREATOR = findCreator(LogAuditRecordsRequest.class);
+
+}

play-services-api/src/main/java/com/google/android/gms/gass/internal/GassRequestParcel.java

@@ -0,0 +1,32 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.gass.internal;
+
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+
+import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+
+@SafeParcelable.Class
+public class GassRequestParcel extends AbstractSafeParcelable {
+
+    @Field(1)
+    public int versionCode;
+    @Field(2)
+    public String packageName;
+    @Field(3)
+    public String appVersionCode;
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        CREATOR.writeToParcel(this, dest, flags);
+    }
+
+    public static final SafeParcelableCreatorAndWriter<GassRequestParcel> CREATOR = findCreator(GassRequestParcel.class);
+}

play-services-api/src/main/java/com/google/android/gms/gass/internal/GassResponseParcel.java

@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.gass.internal;
+
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+
+import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+import com.google.android.gms.feedback.ErrorReport;
+
+@SafeParcelable.Class
+public class GassResponseParcel extends AbstractSafeParcelable {
+
+    @Field(1)
+    public int versionCode;
+
+    @Field(2)
+    public byte[] data;
+
+    public ErrorReport report;
+
+    public GassResponseParcel() {
+    }
+
+    public GassResponseParcel(int i, byte[] bArr) {
+        this.versionCode = i;
+        this.report = null;
+        this.data = bArr;
+    }
+
+    public GassResponseParcel(ErrorReport report) {
+        this.versionCode = 1;
+        this.report = report;
+        this.data = null;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        CREATOR.writeToParcel(this, dest, flags);
+    }
+
+    public static final SafeParcelableCreatorAndWriter<GassResponseParcel> CREATOR = findCreator(GassResponseParcel.class);
+}

play-services-api/src/main/java/com/google/android/gms/pseudonymous/PseudonymousIdToken.java

@@ -0,0 +1,34 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.pseudonymous;
+
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+
+import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+
+@SafeParcelable.Class
+public class PseudonymousIdToken extends AbstractSafeParcelable {
+
+    @Field(2)
+    public String name;
+
+    @Constructor
+    public PseudonymousIdToken(@Param(2) String name) {
+        this.name = name;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        CREATOR.writeToParcel(this, dest, flags);
+    }
+
+    public static final SafeParcelableCreatorAndWriter<PseudonymousIdToken> CREATOR = findCreator(PseudonymousIdToken.class);
+
+}

play-services-api/src/main/java/com/google/android/gms/semanticlocation/SemanticLocationEventRequest.java

@@ -0,0 +1,32 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.google.android.gms.semanticlocation;
+
+
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+
+import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
+
+@SafeParcelable.Class
+public class SemanticLocationEventRequest extends AbstractSafeParcelable {
+    @Field(1)
+    public final float position;
+
+    @Constructor
+    public SemanticLocationEventRequest(@Param(1) float position) {
+        this.position = position;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        CREATOR.writeToParcel(this, dest, flags);
+    }
+
+    public static final SafeParcelableCreatorAndWriter<SemanticLocationEventRequest> CREATOR = findCreator(SemanticLocationEventRequest.class);
+}