Merge branch 'master' into fix_multi_game_sign_in

Author: DaVinci9196

build.gradle

@@ -38,7 +38,7 @@ buildscript {
 
     ext.androidMinSdk = 19
     ext.androidTargetSdk = 29
-    ext.androidCompileSdk = 34
+    ext.androidCompileSdk = 35
 
     ext.localProperties = new Properties()
 

play-services-ads-identifier/core/src/main/res/values-ast/strings.xml

@@ -4,4 +4,4 @@
     <string name="perm_ad_id_notification_label">Avisu d\'ID de publicidá</string>
     <string name="perm_ad_id_description">Permite que l\'aplicación d\'un espublizador acceda in/direutamente a una ID de publicidá.</string>
     <string name="perm_ad_id_label">Permisu d\'ID de publicidá</string>
-</resources>
+</resources>

play-services-ads-identifier/core/src/main/res/values-fa/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="perm_ad_id_label">مجوز شناسه آگهی</string>
+    <string name="perm_ad_id_description">به یک برنامه ناشر اجازه می‌دهد تا به شیوه مستقیم یا غیرمستقیم به یک شناسه آگهی معتبر دسترسی پیدا کند.</string>
+    <string name="perm_ad_id_notification_label">آگاه‌ساز شناسه آگهی</string>
+    <string name="perm_ad_id_notification_description">به یک برنامه اجازه می‌دهد تا هنگام به‌روزرسانی شناسه آگهی یا تنظیمات ردیابی محدود آگهی کاربر، آگاه‌ساز دریافت کند.</string>
+</resources>

play-services-ads-identifier/core/src/main/res/values-in/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="perm_ad_id_description">Memungkinkan aplikasi penerbit mengakses ID periklanan yang valid secara langsung atau tidak langsung.</string>
+    <string name="perm_ad_id_label">Izin ID Periklanan</string>
+    <string name="perm_ad_id_notification_label">Pemberitahuan ID periklanan</string>
+    <string name="perm_ad_id_notification_description">Memungkinkan aplikasi menerima notifikasi ketika ID periklanan atau batas preferensi pelacakan iklan pengguna diperbarui.</string>
+</resources>

play-services-ads-identifier/core/src/main/res/values-lv/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="perm_ad_id_label">Reklāmas identifikatora atļauja</string>
+    <string name="perm_ad_id_description">Ļauj lietotnes izdevējam tieši vai netieši piekļūt derīgam reklāmas identifikatoram.</string>
+    <string name="perm_ad_id_notification_label">Reklāmas identifikatora paziņojums</string>
+    <string name="perm_ad_id_notification_description">Ļauj informēt lietotni, ja mainās reklāmas identifikators vai lietotāja ierobežotie, iestatītie reklāmu izsekošanas iestatījumi.</string>
+</resources>

play-services-ads/core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/ads/dynamite/ModuleDescriptor.java

@@ -5,27 +5,70 @@
 
 package com.google.android.gms.dynamite.descriptors.com.google.android.gms.ads.dynamite;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.ContextWrapper;
-import android.webkit.WebSettings;
+import android.content.SharedPreferences;
+import android.util.Log;
 import androidx.annotation.Keep;
 
+import java.util.Locale;
+
+import static android.os.Build.DEVICE;
+import static android.os.Build.DISPLAY;
+import static android.os.Build.VERSION.RELEASE;
+
 @Keep
 public class ModuleDescriptor {
     public static final String MODULE_ID = "com.google.android.gms.ads.dynamite";
     public static final int MODULE_VERSION = 230500001;
+    private static final String TAG = "AdsDynamiteModule";
 
     /**
      * The ads module might try to access the user agent, requiring initialization on the main thread,
      * which may result in deadlocks when invoked from any other thread. This only happens with microG,
      * because we don't use the highly privileged SELinux Sandbox that regular Play Services uses
      * (which allows apps to read the user-agent from Play Services instead of the WebView). To prevent
-     * the issue we pre-emptively initialize the WebView.
+     * the issue we pre-emptively write a user agent in the local storage of the app.
      */
     public static void init(Context context) {
-        if (context instanceof ContextWrapper) {
-            context = ((ContextWrapper) context).getBaseContext();
+        do {
+            try {
+                injectUserAgentSharedPreference(context);
+            } catch (Exception e) {
+            }
+            if (context instanceof ContextWrapper) {
+                Context baseContext = ((ContextWrapper) context).getBaseContext();
+                if (context == baseContext) break;
+                context = baseContext;
+            } else {
+                break;
+            }
+        } while (context != null);
+    }
+
+    /**
+     * @return A user-agent representing a browser on the current device.
+     */
+    private static String buildDefaultUserAgent() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Mozilla/5.0 (Linux; U; Android");
+        if (RELEASE != null) sb.append(" ").append(RELEASE);
+        sb.append("; ").append(Locale.getDefault());
+        if (DEVICE != null) {
+            sb.append("; ").append(DEVICE);
+            if (DISPLAY != null) sb.append(" Build/").append(DISPLAY);
+        }
+        sb.append(") AppleWebKit/533 Version/4.0 Safari/533");
+        return sb.toString();
+    }
+
+    @SuppressLint("ApplySharedPref")
+    private static void injectUserAgentSharedPreference(Context context) {
+        SharedPreferences preferences = context.getSharedPreferences("admob_user_agent", Context.MODE_PRIVATE);
+        if (!preferences.contains("user_agent")) {
+            preferences.edit().putString("user_agent", buildDefaultUserAgent()).commit();
+            Log.d(TAG, "Injected admob_user_agent into package " + context.getPackageName());
         }
-        WebSettings.getDefaultUserAgent(context);
     }
 }

play-services-api/src/main/aidl/com/google/android/gms/wallet/GetClientTokenRequest.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2025 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.wallet;
+
+parcelable GetClientTokenRequest;

play-services-api/src/main/aidl/com/google/android/gms/wallet/GetClientTokenResponse.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2025 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.wallet;
+
+parcelable GetClientTokenResponse;

play-services-api/src/main/aidl/com/google/android/gms/wallet/internal/IOwService.aidl

@@ -2,7 +2,9 @@ package com.google.android.gms.wallet.internal;
 
 import com.google.android.gms.wallet.internal.IWalletServiceCallbacks;
 import com.google.android.gms.wallet.IsReadyToPayRequest;
+import com.google.android.gms.wallet.GetClientTokenRequest;
 
 interface IOwService {
     void isReadyToPay(in IsReadyToPayRequest request, in Bundle args, IWalletServiceCallbacks callbacks) = 13;
+    void getClientToken(in GetClientTokenRequest getClientTokenRequest, in Bundle options, IWalletServiceCallbacks callbacks) = 14;
 }

play-services-api/src/main/aidl/com/google/android/gms/wallet/internal/IWalletServiceCallbacks.aidl

@@ -1,7 +1,9 @@
 package com.google.android.gms.wallet.internal;
 
 import com.google.android.gms.common.api.Status;
+import com.google.android.gms.wallet.GetClientTokenResponse;
 
 interface IWalletServiceCallbacks {
     void onIsReadyToPayResponse(in Status status, boolean result, in Bundle args) = 8;
+    void onClientTokenReceived(in Status status, in GetClientTokenResponse response, in Bundle extras) = 9;
 }