Phenotype: Rename getConfigurationSnapshot2 for accuracy (#3025)

Also fix log line.

Co-authored-by: Marvin W <[email protected]>

Author: benwaffle

play-services-api/src/main/aidl/com/google/android/gms/phenotype/internal/IPhenotypeService.aidl

@@ -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()

play-services-core/src/main/kotlin/org/microg/gms/phenotype/PhenotypeService.kt

@@ -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?) {
@@ -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)
     }
 
@@ -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"