Skip to content

Commit d940551

Browse files
committed
basement: Add new API/Feature details
1 parent 8db06e8 commit d940551

File tree

53 files changed

+611
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+611
-211
lines changed

play-services-ads/core/src/main/kotlin/org/microg/gms/ads/AdRequestService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import org.microg.gms.utils.warnOnTransactionIssues
2222

2323
private const val TAG = "AdRequestService"
2424

25-
class AdRequestService : BaseService(TAG, GmsService.ADREQUEST) {
25+
class AdRequestService : BaseService(TAG, GmsService.ADMOB) {
2626
override fun handleServiceRequest(callback: IGmsCallbacks, request: GetServiceRequest, service: GmsService) {
2727
val packageName = PackageUtils.getAndCheckCallingPackage(this, request.packageName)
2828
?: throw IllegalArgumentException("Missing package name")

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

Lines changed: 49 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,71 +5,92 @@
55

66
package com.google.android.gms.measurement.internal;
77

8+
import androidx.annotation.Nullable;
89
import org.microg.safeparcel.AutoSafeParcelable;
910

1011
import java.util.List;
1112

1213
public class AppMetadata extends AutoSafeParcelable {
1314
@Field(2)
15+
@Nullable
1416
public String packageName;
1517
@Field(3)
16-
public String googleAppId;
18+
@Nullable
19+
public String appId;
1720
@Field(4)
18-
public String versionName;
21+
@Nullable
22+
public String appVersion;
1923
@Field(5)
20-
public String installerPackageName;
24+
@Nullable
25+
public String appStore;
2126
@Field(6)
22-
private long googleVersion;
27+
public long gmpVersion;
2328
@Field(7)
24-
private long devCertHash;
29+
public long devCertHash;
2530
@Field(8)
26-
private String healthMonitor;
27-
@Field(9)
28-
private boolean measurementEnabled = true;
31+
@Nullable
32+
public String healthMonitorSample;
33+
@Field(value = 9, defaultValue = "true")
34+
public boolean measurementEnabled = true;
2935
@Field(10)
30-
private boolean firstOpen;
31-
@Field(11)
32-
public long versionCode = Integer.MIN_VALUE;
36+
public boolean firstOpen;
37+
@Field(value = 11, defaultValue = "java.lang.Integer.MIN_VALUE")
38+
public long appVersionInt = Integer.MIN_VALUE;
3339
@Field(12)
40+
@Nullable
3441
public String firebaseInstanceId;
3542
@Field(13)
36-
private long androidId;
43+
public long androidId;
3744
@Field(14)
38-
private long instantiationTime;
45+
public long instantiationTime;
3946
@Field(15)
4047
public int appType;
41-
@Field(16)
42-
private boolean adIdReportingEnabled = true;
43-
@Field(17)
48+
@Field(value = 16, defaultValue = "true")
49+
public boolean adIdReportingEnabled = true;
50+
@Field(value = 17, defaultValue = "true")
4451
public boolean ssaidCollectionEnabled = true;
4552
@Field(18)
4653
public boolean deferredAnalyticsCollection;
4754
@Field(19)
4855
public String admobAppId;
4956
@Field(21)
57+
@Nullable
5058
public Boolean allowAdPersonalization;
5159
@Field(22)
52-
private long dynamiteVersion;
60+
public long dynamiteVersion;
5361
@Field(23)
62+
@Nullable
5463
public List<String> safelistedEvents;
5564
@Field(24)
5665
public String gaAppId;
57-
@Field(25)
58-
private String consentSettings = "";
59-
@Field(26)
66+
@Field(value = 25, defaultValue = "\"\"")
67+
public String consentSettings = "";
68+
@Field(value = 26, defaultValue = "\"\"")
6069
public String ephemeralAppInstanceId = "";
6170
@Field(27)
62-
private String sessionStitchingToken;
71+
@Nullable
72+
public String sessionStitchingToken;
6373
@Field(28)
64-
private boolean sgtmUploadEnabled = false;
74+
public boolean sgtmUploadEnabled = false;
6575
@Field(29)
66-
private long targetOsVersion;
67-
@Field(30)
68-
private int consentSource = 100;
69-
@Field(31)
70-
private String dmaConsent = "";
76+
public long targetOsVersion;
77+
@Field(value = 30, defaultValue = "100")
78+
public int consentSource = 100;
79+
@Field(value = 31, defaultValue = "\"\"")
80+
public String dmaConsent = "";
7181
@Field(32)
72-
private int adServicesVersion;
82+
public int adServicesVersion;
83+
@Field(34)
84+
public long l34;
85+
@Field(35)
86+
@Nullable
87+
public String sgtmPreviewKey;
88+
@Field(value = 36, defaultValue = "\"\"")
89+
public String serializedNpaMetadata;
90+
@Field(37)
91+
public long timestamp;
92+
@Field(38)
93+
public int clientUploadEligibility;
7394

7495
public String toString() {
7596
return "AppMetadata[" + packageName + "]";

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@
55

66
package com.google.android.gms.measurement.internal;
77

8-
import org.microg.safeparcel.AutoSafeParcelable;
8+
import android.os.Parcel;
9+
import androidx.annotation.NonNull;
10+
import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
11+
import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
12+
import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
913

10-
public class EventParcel extends AutoSafeParcelable {
14+
@SafeParcelable.Class
15+
public class EventParcel extends AbstractSafeParcelable {
1116
@Field(2)
1217
public String name;
1318
@Field(3)
@@ -17,5 +22,10 @@ public class EventParcel extends AutoSafeParcelable {
1722
@Field(5)
1823
public long timestamp;
1924

20-
public static final Creator<EventParcel> CREATOR = new AutoCreator<>(EventParcel.class);
25+
@Override
26+
public void writeToParcel(@NonNull Parcel dest, int flags) {
27+
CREATOR.writeToParcel(this, dest, flags);
28+
}
29+
30+
public static final SafeParcelableCreatorAndWriter<EventParcel> CREATOR = findCreator(EventParcel.class);
2131
}

play-services-appset/core/src/main/kotlin/org/microg/gms/appset/AppSetService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import java.util.UUID
2424
private const val TAG = "AppSetService"
2525
private val FEATURES = arrayOf(Feature("app_set_id", 1L))
2626

27-
class AppSetService : BaseService(TAG, GmsService.APP_SET) {
27+
class AppSetService : BaseService(TAG, GmsService.APP_SET_ID) {
2828

2929
override fun handleServiceRequest(callback: IGmsCallbacks?, request: GetServiceRequest?, service: GmsService?) {
3030
callback?.onPostInitCompleteWithConnectionInfo(
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2022 microG Project Team
3+
* SPDX-License-Identifier: CC-BY-4.0
4+
* Notice: Portions of this file are reproduced from work created and shared by Google and used
5+
* according to terms described in the Creative Commons 4.0 Attribution License.
6+
* See https://developers.google.com/readme/policies for details.
7+
*/
8+
/**
9+
* Provides facilities to retrieve or save credentials that can be used to
10+
sign the user into your application or sign up a new user.
11+
*/
12+
package com.google.android.gms.auth.api.identity;

play-services-auth-base/src/main/aidl/com/google/android/gms/auth/folsom/internal/IKeyRetrievalService.aidl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ interface IKeyRetrievalService {
3939
void generateOpenVaultRequestOperation(in IByteArrayCallback callback, in RecoveryRequest request, in ApiMetadata metadata) = 15;
4040
void canSilentlyAddGaiaPassword(in IBooleanCallback callback, String accountName, in ApiMetadata metadata) = 16;
4141
void addGaiaPasswordMember(in IStatusCallback callback, String accountName, in ApiMetadata metadata) = 17;
42+
void getDomainState(in IByteArrayCallback callback, String accountName, in ApiMetadata metadata) = 18;
4243
}

play-services-auth-blockstore/core/src/main/kotlin/org/microg/gms/auth/blockstore/BlockstoreApiService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import com.google.android.gms.common.internal.IGmsCallbacks
3434
import kotlinx.coroutines.launch
3535
import org.microg.gms.BaseService
3636
import org.microg.gms.common.GmsService
37-
import org.microg.gms.common.GmsService.BLOCK_STORE
37+
import org.microg.gms.common.GmsService.AUTH_BLOCKSTORE
3838
import org.microg.gms.common.PackageUtils
3939

4040
private const val TAG = "BlockstoreApiService"
@@ -55,7 +55,7 @@ private val FEATURES = arrayOf(
5555
Feature("auth_set_private_restore_credential_key", 1),
5656
)
5757

58-
class BlockstoreApiService : BaseService(TAG, BLOCK_STORE) {
58+
class BlockstoreApiService : BaseService(TAG, AUTH_BLOCKSTORE) {
5959

6060
override fun handleServiceRequest(callback: IGmsCallbacks, request: GetServiceRequest, service: GmsService) {
6161
try {

play-services-auth-workaccount/core/src/main/kotlin/org/microg/gms/auth/workaccount/WorkAccountService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import org.microg.gms.common.PackageUtils
3333

3434
private const val TAG = "GmsWorkAccountService"
3535

36-
class WorkAccountService : BaseService(TAG, GmsService.WORK_ACCOUNT) {
36+
class WorkAccountService : BaseService(TAG, GmsService.WORK_ACCOUNT_API) {
3737
override fun handleServiceRequest(
3838
callback: IGmsCallbacks,
3939
request: GetServiceRequest,

play-services-auth/src/main/java/org/microg/gms/auth/api/signin/GoogleSignInGmsClientImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
public class GoogleSignInGmsClientImpl extends GmsClient<ISignInService> {
1717
public GoogleSignInGmsClientImpl(Context context, ConnectionCallbacks callbacks, OnConnectionFailedListener connectionFailedListener) {
18-
super(context, callbacks, connectionFailedListener, GmsService.AUTH_SIGN_IN.ACTION);
19-
serviceId = GmsService.AUTH_SIGN_IN.SERVICE_ID;
18+
super(context, callbacks, connectionFailedListener, GmsService.AUTH_GOOGLE_SIGN_IN.ACTION);
19+
serviceId = GmsService.AUTH_GOOGLE_SIGN_IN.SERVICE_ID;
2020
}
2121

2222
@Override

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void getPanoramaService(IGmsCallbacks callback, int versionCode, String p
6060
@Override
6161
public void getAppDataSearchService(IGmsCallbacks callback, int versionCode, String packageName)
6262
throws RemoteException {
63-
callGetService(GmsService.INDEX, callback, versionCode, packageName);
63+
callGetService(GmsService.APP_DATA_SEARCH, callback, versionCode, packageName);
6464
}
6565

6666
@Deprecated
@@ -80,7 +80,7 @@ public void getPeopleService(IGmsCallbacks callback, int versionCode, String pac
8080
@Override
8181
public void getReportingService(IGmsCallbacks callback, int versionCode, String packageName,
8282
Bundle params) throws RemoteException {
83-
callGetService(GmsService.LOCATION_REPORTING, callback, versionCode, packageName, params);
83+
callGetService(GmsService.REPORTING, callback, versionCode, packageName, params);
8484
}
8585

8686
@Deprecated
@@ -94,7 +94,7 @@ public void getLocationService(IGmsCallbacks callback, int versionCode, String p
9494
@Override
9595
public void getGoogleLocationManagerService(IGmsCallbacks callback, int versionCode,
9696
String packageName, Bundle params) throws RemoteException {
97-
callGetService(GmsService.LOCATION_MANAGER, callback, versionCode, packageName, params);
97+
callGetService(GmsService.GOOGLE_LOCATION_MANAGER, callback, versionCode, packageName, params);
9898
}
9999

100100
@Deprecated
@@ -114,7 +114,7 @@ public void getGamesService(IGmsCallbacks callback, int versionCode, String pack
114114
@Override
115115
public void getAppStateService(IGmsCallbacks callback, int versionCode, String packageName,
116116
String accountName, String[] scopes) throws RemoteException {
117-
callGetService(GmsService.APPSTATE, callback, versionCode, packageName, null, accountName, scopes);
117+
callGetService(GmsService.APP_STATE, callback, versionCode, packageName, null, accountName, scopes);
118118
}
119119

120120
@Deprecated
@@ -128,14 +128,14 @@ public void getPlayLogService(IGmsCallbacks callback, int versionCode, String pa
128128
@Override
129129
public void getAdMobService(IGmsCallbacks callback, int versionCode, String packageName,
130130
Bundle params) throws RemoteException {
131-
callGetService(GmsService.ADREQUEST, callback, versionCode, packageName, params);
131+
callGetService(GmsService.ADMOB, callback, versionCode, packageName, params);
132132
}
133133

134134
@Deprecated
135135
@Override
136136
public void getDroidGuardService(IGmsCallbacks callback, int versionCode, String packageName,
137137
Bundle params) throws RemoteException {
138-
callGetService(GmsService.DROIDGUARD, callback, versionCode, packageName, params);
138+
callGetService(GmsService.DROID_GUARD, callback, versionCode, packageName, params);
139139
}
140140

141141
@Deprecated
@@ -191,7 +191,7 @@ public void getDriveService(IGmsCallbacks callback, int versionCode, String pack
191191
@Override
192192
public void getLightweightAppDataSearchService(IGmsCallbacks callback, int versionCode,
193193
String packageName) throws RemoteException {
194-
callGetService(GmsService.LIGHTWEIGHT_INDEX, callback, versionCode, packageName);
194+
callGetService(GmsService.LIGHT_INDEX, callback, versionCode, packageName);
195195
}
196196

197197
@Deprecated
@@ -205,7 +205,7 @@ public void getSearchAdministrationService(IGmsCallbacks callback, int versionCo
205205
@Override
206206
public void getAutoBackupService(IGmsCallbacks callback, int versionCode, String packageName,
207207
Bundle params) throws RemoteException {
208-
callGetService(GmsService.PHOTO_AUTO_BACKUP, callback, versionCode, packageName, params);
208+
callGetService(GmsService.AUTO_BACKUP, callback, versionCode, packageName, params);
209209
}
210210

211211
@Deprecated

0 commit comments

Comments
 (0)