Skip to content

phenotype: Rename getConfigurationSnapshot2 for accuracy #3025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 23, 2025
Merged

phenotype: Rename getConfigurationSnapshot2 for accuracy #3025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0233524
Rename getConfigurationSnapshot2 for accuracy
benwaffle Aug 18, 2025
0d313fa
Fix log line
benwaffle Aug 19, 2025
1ebd962
Merge branch 'master' into phenotype-naming
mar-v-in Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...rvices-api/src/main/aidl/com/google/android/gms/phenotype/internal/IPhenotypeService.aidl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ interface IPhenotypeService {
oneway void setDogfoodsToken(IPhenotypeCallbacks callbacks, in byte[] p1) = 7; // returns via callbacks.onDogfoodsTokenSet()
oneway void getFlag(IPhenotypeCallbacks callbacks, String packageName, String name, int type) = 8; // returns via callbacks.onFlag()
oneway void getCommitedConfiguration(IPhenotypeCallbacks callbacks, String packageName) = 9; // returns via callbacks.onCommittedConfiguration()
oneway void getConfigurationSnapshot2(IPhenotypeCallbacks callbacks, String packageName, String user, String p3) = 10; // returns via callbacks.onConfiguration()
oneway void getConfigurationSnapshotWithToken(IPhenotypeCallbacks callbacks, String packageName, String user, String token) = 10; // returns via callbacks.onConfiguration()
oneway void syncAfterOperation(IPhenotypeCallbacks callbacks, String packageName, long version) = 11; // returns via callbacks.onSyncFinished()
oneway void registerSync(IPhenotypeCallbacks callbacks, String packageName, int version, in String[] p3, in byte[] p4, String p5, String p6) = 12; // returns via callbacks.onConfiguration()
oneway void setFlagOverrides(IPhenotypeCallbacks callbacks, String packageName, String user, String flagName, int flagType, int flagDataType, String flagValue) = 13; // returns via callbacks.onFlagOverridesSet()
Expand Down
8 changes: 4 additions & 4 deletions play-services-core/src/main/kotlin/org/microg/gms/phenotype/PhenotypeService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class PhenotypeServiceImpl(val packageName: String?) : IPhenotypeService.Stub()
}

override fun getConfigurationSnapshot(callbacks: IPhenotypeCallbacks, packageName: String?, user: String?) {
getConfigurationSnapshot2(callbacks, packageName, user, null)
getConfigurationSnapshotWithToken(callbacks, packageName, user, null)
}

override fun commitToConfiguration(callbacks: IPhenotypeCallbacks, snapshotToken: String?) {
Expand All @@ -112,7 +112,7 @@ class PhenotypeServiceImpl(val packageName: String?) : IPhenotypeService.Stub()
}

override fun getFlag(callbacks: IPhenotypeCallbacks, packageName: String?, name: String?, type: Int) {
Log.d(TAG, "setDogfoodsToken($packageName, $name, $type)")
Log.d(TAG, "getFlag($packageName, $name, $type)")
callbacks.onFlag(Status.SUCCESS, null)
}

Expand All @@ -123,8 +123,8 @@ class PhenotypeServiceImpl(val packageName: String?) : IPhenotypeService.Stub()
})
}

override fun getConfigurationSnapshot2(callbacks: IPhenotypeCallbacks, packageName: String?, user: String?, p3: String?) {
Log.d(TAG, "getConfigurationSnapshot2($packageName, $user, $p3)")
override fun getConfigurationSnapshotWithToken(callbacks: IPhenotypeCallbacks, packageName: String?, user: String?, p3: String?) {
Log.d(TAG, "getConfigurationSnapshotWithToken($packageName, $user, $p3)")
if (packageName in CONFIGURATION_OPTIONS.keys) {
callbacks.onConfiguration(Status.SUCCESS, Configurations().apply {
serverToken = "unknown"
Expand Down