Merge branch 'master' into passkey_scan_code

Author: DaVinci9196

play-services-base/src/main/aidl/com/google/android/gms/common/internal/service/ICommonCallbacks.aidl

@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2026 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.common.internal.service;
+
+interface ICommonCallbacks {
+    void onClearDefaultAccountResult(int statusCode);
+}

play-services-base/src/main/aidl/com/google/android/gms/common/internal/service/ICommonService.aidl

@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2026 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.common.internal.service;
+
+import com.google.android.gms.common.internal.service.ICommonCallbacks;
+
+interface ICommonService {
+    void clearDefaultAccount(in ICommonCallbacks callbacks) = 0;
+}

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

@@ -1164,6 +1164,12 @@
             </intent-filter>
         </service>
 
+        <service android:name="org.microg.gms.common.GmsCommonService">
+            <intent-filter>
+                <action android:name="com.google.android.gms.common.service.START" />
+            </intent-filter>
+        </service>
+
         <activity
             android:name="org.microg.gms.mlkit.BarcodeScanningActivity"
             android:exported="true"
@@ -1216,7 +1222,6 @@
                 <action android:name="com.google.android.gms.cast.remote_display.service.START" />
                 <action android:name="com.google.android.gms.chromesync.service.START" />
                 <action android:name="com.google.android.gms.common.download.START" />
-                <action android:name="com.google.android.gms.common.service.START" />
                 <action android:name="com.google.android.gms.config.START" />
                 <action android:name="com.google.android.gms.constellation.service.START" />
                 <action android:name="com.google.android.gms.deviceconnection.service.START" />

play-services-core/src/main/kotlin/org/microg/gms/common/GmsCommonService.kt

@@ -0,0 +1,40 @@
+/*
+ * SPDX-FileCopyrightText: 2026 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.common
+
+import android.content.Context
+import android.util.Log
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import com.google.android.gms.common.ConnectionResult
+import com.google.android.gms.common.internal.GetServiceRequest
+import com.google.android.gms.common.internal.IGmsCallbacks
+import com.google.android.gms.common.internal.service.ICommonCallbacks
+import com.google.android.gms.common.internal.service.ICommonService
+import org.microg.gms.BaseService
+import org.microg.gms.auth.signin.SignInConfigurationService
+
+private const val TAG = "GmsCommonService"
+
+class GmsCommonService : BaseService(TAG, GmsService.COMMON) {
+    override fun handleServiceRequest(callback: IGmsCallbacks?, request: GetServiceRequest, service: GmsService?) {
+        val packageName = PackageUtils.getAndCheckCallingPackage(this, request.packageName) ?: throw IllegalArgumentException("Missing package name")
+        Log.d(TAG, "handleServiceRequest: start: $packageName")
+        callback?.onPostInitComplete(ConnectionResult.SUCCESS, GmsCommonServiceImpl(this, packageName, lifecycle).asBinder(), null)
+    }
+}
+
+class GmsCommonServiceImpl(val context: Context, val packageName: String, override val lifecycle: Lifecycle) : ICommonService.Stub(), LifecycleOwner {
+    override fun clearDefaultAccount(callbacks: ICommonCallbacks?) {
+        Log.d(TAG, "clearDefaultAccount: packageName: $packageName")
+        lifecycleScope.launchWhenStarted {
+            AccountUtils.get(context).removeSelectedAccount(packageName)
+            SignInConfigurationService.setAuthInfo(context, packageName, null, null)
+            runCatching { callbacks?.onClearDefaultAccountResult(0) }
+        }
+    }
+}