Integrate RCS enrollment services and phone-verification lifecycle fixes

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

@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2026 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.phenotype.internal;
+
+import com.google.android.gms.common.api.Status;
+
+interface IGetStorageInfoCallbacks {
+    oneway void onResult(in Status status, in byte[] storageInfo) = 1;
+}

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

@@ -2,6 +2,7 @@ package com.google.android.gms.phenotype.internal;
 
 import com.google.android.gms.common.api.internal.IStatusCallback;
 import com.google.android.gms.phenotype.internal.IPhenotypeCallbacks;
+import com.google.android.gms.phenotype.internal.IGetStorageInfoCallbacks;
 import com.google.android.gms.phenotype.Flag;
 import com.google.android.gms.phenotype.RegistrationInfo;
 
@@ -32,4 +33,5 @@ interface IPhenotypeService {
     oneway void syncAllAfterOperation(IPhenotypeCallbacks callbacks, long p1) = 23; // returns via callbacks.onSyncFinished()
     oneway void setRuntimeProperties(IStatusCallback callbacks, String p1, in byte[] p2) = 24;
 //    oneway void setExternalExperiments(IStatusCallback callbacks, String p1, in List<byte[]> p2) = 25;
+    oneway void getStorageInfo(IGetStorageInfoCallbacks callbacks) = 26; // Binder transaction 27; returns via callbacks.onResult()
 }

play-services-asterism/build.gradle

@@ -0,0 +1,40 @@
+/*
+ * SPDX-FileCopyrightText: 2026, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+android {
+    namespace "org.microg.gms.asterism"
+
+    compileSdkVersion androidCompileSdk
+    buildToolsVersion "$androidBuildVersionTools"
+
+    buildFeatures {
+        aidl = true
+    }
+
+    defaultConfig {
+        versionName version
+        minSdkVersion androidMinSdk
+        targetSdkVersion androidTargetSdk
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+apply from: '../gradle/publish-android.gradle'
+
+description = 'microG implementation of play-services-asterism'
+
+dependencies {
+    implementation project(':play-services-basement')
+
+    annotationProcessor project(":safe-parcel-processor")
+}

play-services-asterism/core/build.gradle

@@ -0,0 +1,55 @@
+/*
+ * SPDX-FileCopyrightText: 2026, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply plugin: 'kotlin-android'
+apply plugin: 'signing'
+
+android {
+    namespace "org.microg.gms.asterism.core"
+
+    compileSdkVersion androidCompileSdk
+    buildToolsVersion "$androidBuildVersionTools"
+
+    defaultConfig {
+        versionName version
+        minSdkVersion androidMinSdk
+        targetSdkVersion androidTargetSdk
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+        test.java.srcDirs += 'src/test/kotlin'
+    }
+
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = 1.8
+    }
+}
+
+apply from: '../../gradle/publish-android.gradle'
+
+description = 'microG service implementation for play-services-asterism'
+
+dependencies {
+    api project(':play-services-asterism')
+
+    implementation project(':play-services-base-core')
+    implementation project(':play-services-constellation-core')
+
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutineVersion"
+    testImplementation 'org.mockito:mockito-core:5.11.0'
+}

play-services-asterism/core/src/main/AndroidManifest.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ SPDX-FileCopyrightText: 2026, microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application>
+        <service
+            android:name=".AsterismApiService"
+            android:exported="true"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="com.google.android.gms.asterism.service.START" />
+            </intent-filter>
+        </service>
+    </application>
+</manifest>

play-services-asterism/core/src/main/kotlin/com/google/android/gms/asterism/GetAsterismConsent.kt

@@ -0,0 +1,31 @@
+package com.google.android.gms.asterism
+
+import org.microg.gms.constellation.core.proto.AsterismClient
+import org.microg.gms.constellation.core.proto.Consent
+import org.microg.gms.constellation.core.proto.ConsentVersion
+
+val GetAsterismConsentRequest.asterismClient: AsterismClient
+    get() = AsterismClient.fromValue(asterismClientValue) ?: AsterismClient.UNKNOWN_CLIENT
+
+fun getAsterismConsentResponse(
+    requestCode: Int,
+    consentState: Consent,
+    gmscoreIidToken: String?,
+    fid: String?,
+    consentVersion: ConsentVersion
+): GetAsterismConsentResponse {
+    val consentStateValue =
+        if (consentState == Consent.CONSENTED || consentState == Consent.CONSENT_UNKNOWN) {
+            consentState.value
+        } else {
+            Consent.NO_CONSENT.value
+        }
+
+    return GetAsterismConsentResponse(
+        requestCode,
+        consentStateValue,
+        gmscoreIidToken,
+        fid,
+        consentVersion.value
+    )
+}

play-services-asterism/core/src/main/kotlin/com/google/android/gms/asterism/SetAsterismConsent.kt

@@ -0,0 +1,50 @@
+package com.google.android.gms.asterism
+
+import org.microg.gms.constellation.core.proto.AsterismClient
+import org.microg.gms.constellation.core.proto.AsterismConsent.DeviceConsentVersion
+import org.microg.gms.constellation.core.proto.Consent
+import org.microg.gms.constellation.core.proto.ConsentSource
+import org.microg.gms.constellation.core.proto.ConsentVersion
+
+enum class SetAsterismConsentRequestStatus(val value: Int) {
+    RESOURCE_TOS(0),
+    STATIC_STRING(1),
+    RCS(2),
+    ON_DEMAND(3),
+    RESOURCE_TOS_FALLBACK(4);
+
+    companion object {
+        fun fromValue(value: Int): SetAsterismConsentRequestStatus =
+            entries.find { it.value == value } ?: RESOURCE_TOS_FALLBACK
+    }
+}
+
+val SetAsterismConsentRequest.asterismClient: AsterismClient
+    get() = AsterismClient.fromValue(asterismClientValue) ?: AsterismClient.UNKNOWN_CLIENT
+
+val SetAsterismConsentRequest.consent: Consent
+    get() = Consent.fromValue(consentValue) ?: Consent.CONSENT_UNKNOWN
+
+val SetAsterismConsentRequest.consentVersion: ConsentVersion?
+    get() = ConsentVersion.fromValue(consentVersionValue)
+
+val SetAsterismConsentRequest.deviceConsentSource: ConsentSource
+    get() = ConsentSource.fromValue(deviceConsentSourceValue) ?: ConsentSource.SOURCE_UNSPECIFIED
+
+val SetAsterismConsentRequest.deviceConsentVersion: DeviceConsentVersion
+    get() = DeviceConsentVersion.fromValue(deviceConsentVersionValue).let {
+        if (it == null || it == DeviceConsentVersion.UNKNOWN) {
+            DeviceConsentVersion.PHONE_VERIFICATION_DEFAULT
+        } else {
+            it
+        }
+    }
+
+val SetAsterismConsentRequest.status: SetAsterismConsentRequestStatus
+    get() = SetAsterismConsentRequestStatus.fromValue(statusValue)
+
+fun SetAsterismConsentRequest.isDevicePnvrFlow(): Boolean {
+    return asterismClient == AsterismClient.CONSTELLATION &&
+            deviceConsentSourceValue > 0 &&
+            deviceConsentVersionValue > 0
+}

play-services-asterism/core/src/main/kotlin/org/microg/gms/asterism/core/AsterismApiService.kt

@@ -0,0 +1,104 @@
+package org.microg.gms.asterism.core
+
+import android.content.Context
+import android.os.Build
+import android.util.Log
+import com.google.android.gms.asterism.GetAsterismConsentRequest
+import com.google.android.gms.asterism.SetAsterismConsentRequest
+import com.google.android.gms.asterism.internal.IAsterismApiService
+import com.google.android.gms.asterism.internal.IAsterismCallbacks
+import com.google.android.gms.common.Feature
+import com.google.android.gms.common.api.Status
+import com.google.android.gms.common.internal.ConnectionInfo
+import com.google.android.gms.common.internal.GetServiceRequest
+import com.google.android.gms.common.internal.IGmsCallbacks
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import org.microg.gms.BaseService
+import org.microg.gms.common.GmsService
+import org.microg.gms.common.PackageUtils
+
+private const val TAG = "AsterismApiService"
+
+class AsterismApiService : BaseService(TAG, GmsService.ASTERISM) {
+    private val serviceScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    override fun handleServiceRequest(
+        callback: IGmsCallbacks?,
+        request: GetServiceRequest?,
+        service: GmsService?
+    ) {
+        val packageName = PackageUtils.getAndCheckCallingPackage(this, request?.packageName)
+        if (!PackageUtils.isGooglePackage(this, packageName)) {
+            throw SecurityException("$packageName is not a Google package")
+        }
+        callback!!.onPostInitCompleteWithConnectionInfo(
+            0,
+            AsterismApiServiceImpl(this, serviceScope).asBinder(),
+            ConnectionInfo().apply {
+                features = arrayOf(
+                    Feature("asterism_consent", 3),
+                    Feature("one_time_verification", 1),
+                    Feature("carrier_auth", 1),
+                    Feature("verify_phone_number", 2),
+                    Feature("get_iid_token", 1),
+                    Feature("get_pnv_capabilities", 1),
+                    Feature("ts43", 1),
+                    Feature("verify_phone_number_local_read", 1)
+                )
+            }
+        )
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        serviceScope.cancel("AsterismApiService destroyed")
+    }
+}
+
+class AsterismApiServiceImpl(
+    private val context: Context,
+    serviceScope: CoroutineScope
+) : IAsterismApiService.Stub() {
+    private val requestDispatcher = AsterismRequestDispatcher(serviceScope)
+    override fun getAsterismConsent(
+        cb: IAsterismCallbacks?,
+        request: GetAsterismConsentRequest?,
+    ) {
+        Log.i(TAG, "getAsterismConsent()")
+        if (cb == null || request == null) return
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            cb.onConsentFetched(Status.INTERNAL_ERROR, null)
+            return
+        }
+        requestDispatcher.dispatch(cb, "getAsterismConsent") { callbacks ->
+            handleGetAsterismConsent(context, callbacks, request)
+        }
+    }
+
+    override fun setAsterismConsent(cb: IAsterismCallbacks?, request: SetAsterismConsentRequest?) {
+        Log.i(TAG, "setAsterismConsent()")
+        if (cb == null || request == null) return
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            cb.onConsentRegistered(Status.INTERNAL_ERROR, null)
+            return
+        }
+        requestDispatcher.dispatch(cb, "setAsterismConsent") { callbacks ->
+            handleSetAsterismConsent(context, callbacks, request)
+        }
+    }
+
+    override fun getIsPnvrConstellationDevice(cb: IAsterismCallbacks?) {
+        Log.i(TAG, "getIsPnvrConstellationDevice()")
+        if (cb == null) return
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            cb.onIsPnvrConstellationDevice(Status.INTERNAL_ERROR, false)
+            return
+        }
+        requestDispatcher.dispatch(cb, "getIsPnvrConstellationDevice") { callbacks ->
+            handleGetIsPnvrConstellationDevice(context, callbacks)
+        }
+    }
+}

play-services-asterism/core/src/main/kotlin/org/microg/gms/asterism/core/AsterismCallbacksWrapper.kt

@@ -0,0 +1,42 @@
+/*
+ * SPDX-FileCopyrightText: 2026 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.asterism.core
+
+import android.os.IBinder
+import android.os.RemoteException
+import android.util.Log
+import com.google.android.gms.asterism.GetAsterismConsentResponse
+import com.google.android.gms.asterism.SetAsterismConsentResponse
+import com.google.android.gms.asterism.internal.IAsterismCallbacks
+import com.google.android.gms.common.api.Status
+import kotlinx.coroutines.CancellationException
+
+private const val TAG = "AsterismCallbacks"
+
+internal class AsterismCallbacksWrapper(private val delegate: IAsterismCallbacks) : IAsterismCallbacks {
+    override fun onConsentFetched(status: Status?, response: GetAsterismConsentResponse?) =
+        runRemote("onConsentFetched") { delegate.onConsentFetched(status, response) }
+
+    override fun onConsentRegistered(status: Status?, response: SetAsterismConsentResponse?) =
+        runRemote("onConsentRegistered") { delegate.onConsentRegistered(status, response) }
+
+    override fun onIsPnvrConstellationDevice(status: Status?, isPnvrDevice: Boolean) =
+        runRemote("onIsPnvrConstellationDevice") { delegate.onIsPnvrConstellationDevice(status, isPnvrDevice) }
+
+    override fun asBinder(): IBinder = delegate.asBinder()
+
+    private inline fun runRemote(method: String, block: () -> Unit) {
+        try {
+            block()
+        } catch (e: CancellationException) {
+            throw e
+        } catch (e: RemoteException) {
+            Log.w(TAG, "RemoteException in $method", e)
+        } catch (e: RuntimeException) {
+            Log.w(TAG, "RuntimeException delivering $method", e)
+        }
+    }
+}