Add some messing API fields

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

@@ -7,13 +7,55 @@ package com.google.android.gms.measurement.internal;
 
 import org.microg.safeparcel.AutoSafeParcelable;
 
+import java.util.List;
+
 public class AppMetadata extends AutoSafeParcelable {
     @Field(2)
     public String packageName;
+    @Field(3)
+    public String googleAppId;
     @Field(4)
     public String versionName;
+    @Field(5)
+    public String installerPackageName;
+    @Field(6)
+    private long field6;
+    @Field(7)
+    private long field7;
+    @Field(8)
+    private String field8;
+    @Field(9)
+    private boolean field9 = true;
+    @Field(10)
+    private boolean field10;
     @Field(11)
-    public long versionCode;
+    public long versionCode = Integer.MIN_VALUE;
+    @Field(12)
+    private String field12;
+    @Field(13)
+    private long field13;
+    @Field(14)
+    private long field14;
+    @Field(15)
+    public int appType;
+    @Field(16)
+    private boolean field16;
+    @Field(17)
+    public boolean ssaidCollectionEnabled = true;
+    @Field(18)
+    public boolean deferredAnalyticsCollection;
+    @Field(19)
+    public String admobAppId;
+    @Field(21)
+    public Boolean allowAdPersonalization;
+    @Field(22)
+    private long field22;
+    @Field(23)
+    public List<String> safelistedEvents;
+    @Field(24)
+    public String gaAppId;
+    @Field(25)
+    private String field25;
 
     public static final Creator<AppMetadata> CREATOR = new AutoCreator<>(AppMetadata.class);
 }

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

@@ -8,5 +8,28 @@ package com.google.android.gms.measurement.internal;
 import org.microg.safeparcel.AutoSafeParcelable;
 
 public class ConditionalUserPropertyParcel extends AutoSafeParcelable {
+    @Field(2)
+    public String appId;
+    @Field(3)
+    public String origin;
+    @Field(4)
+    public UserAttributeParcel userAttribute;
+    @Field(5)
+    public long creationTimestamp;
+    @Field(6)
+    public boolean active;
+    @Field(7)
+    public String triggerEventName;
+    @Field(8)
+    public EventParcel timedOutEvent;
+    @Field(9)
+    public long triggerTimeout;
+    @Field(10)
+    public EventParcel triggerEvent;
+    @Field(11)
+    public long timeToLive;
+    @Field(12)
+    public EventParcel expiredEvent;
+
     public static final Creator<ConditionalUserPropertyParcel> CREATOR = new AutoCreator<>(ConditionalUserPropertyParcel.class);
 }

play-services-basement/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java

@@ -20,6 +20,7 @@ import android.accounts.Account;
 import android.os.Bundle;
 import android.os.IBinder;
 
+import com.google.android.gms.common.Feature;
 import com.google.android.gms.common.api.Scope;
 
 import org.microg.gms.common.Constants;
@@ -30,32 +31,32 @@ import org.microg.safeparcel.SafeParceled;
 import java.util.Arrays;
 
 public class GetServiceRequest extends AutoSafeParcelable {
-    @SafeParceled(1)
+    @Field(1)
-    private int versionCode = 3;
+    private int versionCode = 4;
-
+    @Field(2)
-    @SafeParceled(2)
     public final int serviceId;
-
+    @Field(3)
-    @SafeParceled(3)
     public int gmsVersion;
-
+    @Field(4)
-    @SafeParceled(4)
     public String packageName;
-
+    @Field(5)
-    @SafeParceled(5)
     public IBinder accountAccessor;
-
+    @Field(6)
-    @SafeParceled(6)
     public Scope[] scopes;
-
+    @Field(7)
-    @SafeParceled(7)
     public Bundle extras;
-
+    @Field(8)
-    @SafeParceled(8)
     public Account account;
-
+    @Field(9)
-    @SafeParceled(9)
+    private long field9;
-    public long long1;
+    @Field(10)
+    public Feature[] defaultFeatures;
+    @Field(11)
+    public Feature[] apiFeatures;
+    @Field(12)
+    private boolean field12;
+    @Field(13)
+    private int field13;
 
     private GetServiceRequest() {
         serviceId = -1;
@@ -65,6 +66,7 @@ public class GetServiceRequest extends AutoSafeParcelable {
     public GetServiceRequest(int serviceId) {
         this.serviceId = serviceId;
         this.gmsVersion = Constants.MAX_REFERENCE_VERSION;
+        this.field12 = true;
     }
 
     @Override