Merge branch 'microg:master' into patch-names

Author: ale5000-git

play-services-core/src/main/kotlin/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService.kt

@@ -7,7 +7,6 @@ package com.google.android.gms.measurement.internal
 import android.content.Intent
 import android.os.Bundle
 import android.os.Parcel
-import android.os.Parcelable
 import android.util.Log
 import androidx.annotation.Keep
 import androidx.core.os.bundleOf
@@ -253,5 +252,43 @@ class AppMeasurementDynamiteService : IAppMeasurementDynamiteService.Stub() {
         Log.d(TAG, "Not yet implemented: setSgtmDebugInfo")
     }
 
+    override fun setCurrentScreenByScionActivityInfo(info: ScionActivityInfo?, screenName: String?, className: String?, eventElapsedRealtime: Long) {
+        Log.d(TAG, "Not yet implemented: setCurrentScreenByScionActivityInfo")
+    }
+
+    override fun onActivityStartedByScionActivityInfo(info: ScionActivityInfo?, eventElapsedRealtime: Long) {
+        Log.d(TAG, "Not yet implemented: onActivityStartedByScionActivityInfo")
+    }
+
+    override fun onActivityStoppedByScionActivityInfo(info: ScionActivityInfo?, eventElapsedRealtime: Long) {
+        Log.d(TAG, "Not yet implemented: onActivityStoppedByScionActivityInfo")
+    }
+
+    override fun onActivityCreatedByScionActivityInfo(info: ScionActivityInfo?, savedInstanceState: Bundle?, eventElapsedRealtime: Long) {
+        Log.d(TAG, "Not yet implemented: onActivityCreatedByScionActivityInfo")
+    }
+
+    override fun onActivityDestroyedByScionActivityInfo(info: ScionActivityInfo?, eventElapsedRealtime: Long) {
+        Log.d(TAG, "Not yet implemented: onActivityDestroyedByScionActivityInfo")
+    }
+
+    override fun onActivityPausedByScionActivityInfo(info: ScionActivityInfo?, eventElapsedRealtime: Long) {
+        Log.d(TAG, "Not yet implemented: onActivityPausedByScionActivityInfo")
+    }
+
+    override fun onActivityResumedByScionActivityInfo(info: ScionActivityInfo?, eventElapsedRealtime: Long) {
+        Log.d(TAG, "Not yet implemented: onActivityResumedByScionActivityInfo")
+    }
+
+    override fun onActivitySaveInstanceStateByScionActivityInfo(info: ScionActivityInfo?, receiver: IBundleReceiver?, eventElapsedRealtime: Long) {
+        Log.d(TAG, "Not yet implemented: onActivitySaveInstanceStateByScionActivityInfo")
+        returnBundle(receiver, Bundle())
+    }
+
+    override fun retrieveAndUploadBatches(callback: IDynamiteUploadBatchesCallback?) {
+        Log.d(TAG, "Not yet implemented: retrieveAndUploadBatches")
+        runCatching { callback?.onUploadBatches() }
+    }
+
     override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean = warnOnTransactionIssues(code, reply, flags, TAG) { super.onTransact(code, data, reply, flags) }
 }

play-services-measurement-base/build.gradle

@@ -36,4 +36,6 @@ description = 'microG implementation of play-services-clearcut'
 dependencies {
     // Dependencies from play-services-measurement-base:21.2.0
     api project(':play-services-basement')
+
+    annotationProcessor project(":safe-parcel-processor")
 }

play-services-measurement-base/src/main/aidl/com/google/android/gms/measurement/api/internal/IAppMeasurementDynamiteService.aidl

@@ -2,9 +2,11 @@ package com.google.android.gms.measurement.api.internal;
 
 import com.google.android.gms.dynamic.IObjectWrapper;
 import com.google.android.gms.measurement.api.internal.IBundleReceiver;
+import com.google.android.gms.measurement.api.internal.IDynamiteUploadBatchesCallback;
 import com.google.android.gms.measurement.api.internal.IEventHandlerProxy;
 import com.google.android.gms.measurement.api.internal.IStringProvider;
 import com.google.android.gms.measurement.api.internal.InitializationParams;
+import com.google.android.gms.measurement.api.internal.ScionActivityInfo;
 
 interface IAppMeasurementDynamiteService {
     void initialize(in IObjectWrapper context, in InitializationParams params, long eventTimeMillis) = 0;
@@ -55,4 +57,14 @@ interface IAppMeasurementDynamiteService {
     void getSessionId(IBundleReceiver receiver) = 45;
 
     void setSgtmDebugInfo(in Intent intent) = 47;
+
+    void setCurrentScreenByScionActivityInfo(in ScionActivityInfo info, String screenName, String className, long eventElapsedRealtime) = 49;
+    void onActivityStartedByScionActivityInfo(in ScionActivityInfo info, long eventElapsedRealtime) = 50;
+    void onActivityStoppedByScionActivityInfo(in ScionActivityInfo info, long eventElapsedRealtime) = 51;
+    void onActivityCreatedByScionActivityInfo(in ScionActivityInfo info, in Bundle savedInstanceState, long eventElapsedRealtime) = 52;
+    void onActivityDestroyedByScionActivityInfo(in ScionActivityInfo info, long eventElapsedRealtime) = 53;
+    void onActivityPausedByScionActivityInfo(in ScionActivityInfo info, long eventElapsedRealtime) = 54;
+    void onActivityResumedByScionActivityInfo(in ScionActivityInfo info, long eventElapsedRealtime) = 55;
+    void onActivitySaveInstanceStateByScionActivityInfo(in ScionActivityInfo info, IBundleReceiver receiver, long eventElapsedRealtime) = 56;
+    void retrieveAndUploadBatches(IDynamiteUploadBatchesCallback callback) = 57;
 }

play-services-measurement-base/src/main/aidl/com/google/android/gms/measurement/api/internal/IDynamiteUploadBatchesCallback.aidl

@@ -0,0 +1,5 @@
+package com.google.android.gms.measurement.api.internal;
+
+interface IDynamiteUploadBatchesCallback {
+    void onUploadBatches();
+}

play-services-measurement-base/src/main/aidl/com/google/android/gms/measurement/api/internal/ScionActivityInfo.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.measurement.api.internal;
+
+parcelable ScionActivityInfo;

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

@@ -7,9 +7,14 @@
 
 import android.os.Bundle;
 
-import org.microg.safeparcel.AutoSafeParcelable;
+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;
 
-public class InitializationParams extends AutoSafeParcelable {
+@SafeParcelable.Class
+public class InitializationParams extends AbstractSafeParcelable {
     @Field(1)
     public long field1;
     @Field(2)
@@ -28,6 +33,7 @@ public class InitializationParams extends AutoSafeParcelable {
     public String field8;
 
     @Override
+    @NonNull
     public String toString() {
         return "InitializationParams{" +
                 "field1=" + field1 +
@@ -41,5 +47,10 @@ public String toString() {
                 '}';
     }
 
-    public static final Creator<InitializationParams> CREATOR = new AutoCreator<>(InitializationParams.class);
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        CREATOR.writeToParcel(this, dest, flags);
+    }
+
+    public static final SafeParcelableCreatorAndWriter<InitializationParams> CREATOR = findCreator(InitializationParams.class);
 }

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

@@ -0,0 +1,37 @@
+/*
+ * SPDX-FileCopyrightText: 2025 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.measurement.api.internal;
+
+import android.content.Intent;
+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 ScionActivityInfo extends AbstractSafeParcelable {
+    @Field(1)
+    public final int id;
+    @Field(2)
+    public final String className;
+    @Field(3)
+    public final Intent intent;
+
+    @Constructor
+    public ScionActivityInfo(@Param(1) int id, @Param(2) String className, @Param(3) Intent intent) {
+        this.id = id;
+        this.className = className;
+        this.intent = intent;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        CREATOR.writeToParcel(this, dest, flags);
+    }
+
+    public static final SafeParcelableCreatorAndWriter<ScionActivityInfo> CREATOR = findCreator(ScionActivityInfo.class);
+}