diff --git a/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/AppMetadata.aidl b/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/AppMetadata.aidl new file mode 100644 index 00000000..005edc39 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/AppMetadata.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.measurement.internal; + +parcelable AppMetadata; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/ConditionalUserPropertyParcel.aidl b/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/ConditionalUserPropertyParcel.aidl new file mode 100644 index 00000000..de59ae57 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/ConditionalUserPropertyParcel.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.measurement.internal; + +parcelable ConditionalUserPropertyParcel; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/EventParcel.aidl b/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/EventParcel.aidl new file mode 100644 index 00000000..372d66f6 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/EventParcel.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.measurement.internal; + +parcelable EventParcel; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/IMeasurementService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/IMeasurementService.aidl index 692d414a..8a99173a 100644 --- a/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/IMeasurementService.aidl +++ b/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/IMeasurementService.aidl @@ -1,5 +1,25 @@ package com.google.android.gms.measurement.internal; -interface IMeasurementService { +import com.google.android.gms.measurement.internal.AppMetadata; +import com.google.android.gms.measurement.internal.ConditionalUserPropertyParcel; +import com.google.android.gms.measurement.internal.EventParcel; -} \ No newline at end of file +interface IMeasurementService { + void f1(in EventParcel p0, in AppMetadata p1) = 0; +// void zza(UserAttributeParcel p0, AppMetadata p1) = 1; + void f4(in AppMetadata p0) = 3; +// void zza(EventParcel p0, String p1, String p2) = 4; +// void zzb(AppMetadata p0) = 5; +// List zza(AppMetadata p0, boolean p1) = 6; +// byte[] zza(EventParcel p0, String p1) = 8; + void f10(long p0, String p1, String p2, String p3) = 9; + String f11(in AppMetadata p0) = 10; + void f12(in ConditionalUserPropertyParcel p0, in AppMetadata p1) = 11; +// void zza(ConditionalUserPropertyParcel p0) = 12; +// List zza(String p0, String p1, boolean p2, AppMetadata p3) = 13; +// List zza(String p0, String p1, String p2, boolean p3) = 14; +// List zza(String p0, String p1, AppMetadata p2) = 15; +// List zza(String p0, String p1, String p2) = 16; +// void zzd(AppMetadata p0) = 17; +// void zza(Bundle p0, AppMetadata p1) = 18; +} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/UserAttributeParcel.aidl b/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/UserAttributeParcel.aidl new file mode 100644 index 00000000..efb3b721 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/measurement/internal/UserAttributeParcel.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.measurement.internal; + +parcelable UserAttributeParcel; diff --git a/play-services-api/src/main/java/com/google/android/gms/measurement/internal/AppMetadata.java b/play-services-api/src/main/java/com/google/android/gms/measurement/internal/AppMetadata.java new file mode 100644 index 00000000..754f31b5 --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/measurement/internal/AppMetadata.java @@ -0,0 +1,19 @@ +/* + * SPDX-FileCopyrightText: 2020, microG Project Team + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.google.android.gms.measurement.internal; + +import org.microg.safeparcel.AutoSafeParcelable; + +public class AppMetadata extends AutoSafeParcelable { + @Field(2) + public String packageName; + @Field(4) + public String versionName; + @Field(11) + public long versionCode; + + public static final Creator CREATOR = new AutoCreator<>(AppMetadata.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/measurement/internal/ConditionalUserPropertyParcel.java b/play-services-api/src/main/java/com/google/android/gms/measurement/internal/ConditionalUserPropertyParcel.java new file mode 100644 index 00000000..e0594ca8 --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/measurement/internal/ConditionalUserPropertyParcel.java @@ -0,0 +1,12 @@ +/* + * SPDX-FileCopyrightText: 2020, microG Project Team + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.google.android.gms.measurement.internal; + +import org.microg.safeparcel.AutoSafeParcelable; + +public class ConditionalUserPropertyParcel extends AutoSafeParcelable { + public static final Creator CREATOR = new AutoCreator<>(ConditionalUserPropertyParcel.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/measurement/internal/EventParcel.java b/play-services-api/src/main/java/com/google/android/gms/measurement/internal/EventParcel.java new file mode 100644 index 00000000..3ff7c796 --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/measurement/internal/EventParcel.java @@ -0,0 +1,12 @@ +/* + * SPDX-FileCopyrightText: 2020, microG Project Team + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.google.android.gms.measurement.internal; + +import org.microg.safeparcel.AutoSafeParcelable; + +public class EventParcel extends AutoSafeParcelable { + public static final Creator CREATOR = new AutoCreator<>(EventParcel.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/measurement/internal/UserAttributeParcel.java b/play-services-api/src/main/java/com/google/android/gms/measurement/internal/UserAttributeParcel.java new file mode 100644 index 00000000..6070b923 --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/measurement/internal/UserAttributeParcel.java @@ -0,0 +1,12 @@ +/* + * SPDX-FileCopyrightText: 2020, microG Project Team + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.google.android.gms.measurement.internal; + +import org.microg.safeparcel.AutoSafeParcelable; + +public class UserAttributeParcel extends AutoSafeParcelable { + public static final Creator CREATOR = new AutoCreator<>(UserAttributeParcel.class); +} diff --git a/play-services-core/src/main/java/org/microg/gms/measurement/MeasurementServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/measurement/MeasurementServiceImpl.java index c78851b0..b6fbb62b 100644 --- a/play-services-core/src/main/java/org/microg/gms/measurement/MeasurementServiceImpl.java +++ b/play-services-core/src/main/java/org/microg/gms/measurement/MeasurementServiceImpl.java @@ -20,6 +20,9 @@ import android.os.Parcel; import android.os.RemoteException; import android.util.Log; +import com.google.android.gms.measurement.internal.AppMetadata; +import com.google.android.gms.measurement.internal.ConditionalUserPropertyParcel; +import com.google.android.gms.measurement.internal.EventParcel; import com.google.android.gms.measurement.internal.IMeasurementService; public class MeasurementServiceImpl extends IMeasurementService.Stub { @@ -31,4 +34,30 @@ public class MeasurementServiceImpl extends IMeasurementService.Stub { Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags); return false; } + + @Override + public void f1(EventParcel p0, AppMetadata p1) throws RemoteException { + Log.d(TAG, "f1: " + p1.packageName); + } + + @Override + public void f4(AppMetadata p0) throws RemoteException { + Log.d(TAG, "f4: " + p0.packageName); + } + + @Override + public void f10(long p0, String p1, String p2, String p3) throws RemoteException { + Log.d(TAG, "f10: " + p1); + } + + @Override + public String f11(AppMetadata p0) throws RemoteException { + Log.d(TAG, "f11: " + p0.packageName); + return null; + } + + @Override + public void f12(ConditionalUserPropertyParcel p0, AppMetadata p1) throws RemoteException { + Log.d(TAG, "f12: " + p1.packageName); + } }