From 843497509c41e6541782bc68095785e41a32cf62 Mon Sep 17 00:00:00 2001
From: cuynu <cuynu@proton.me>
Date: Sat, 22 Mar 2025 16:30:00 +0700
Subject: [PATCH 1/2] add lavender profile

---
 .../profile_projectinfinityx_redminote7.xml   | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 play-services-core/src/main/res/xml/profile_projectinfinityx_redminote7.xml

diff --git a/play-services-core/src/main/res/xml/profile_projectinfinityx_redminote7.xml b/play-services-core/src/main/res/xml/profile_projectinfinityx_redminote7.xml
new file mode 100644
index 00000000..f92014ae
--- /dev/null
+++ b/play-services-core/src/main/res/xml/profile_projectinfinityx_redminote7.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: none
+    SPDX-License-Identifier: CC0-1.0
+    SPDX-FileType: SOURCE
+-->
+<profile name="Redmi Note 7 (Project Infinity X)" product="infinity_lavender" sdk="35" id="infinity_lavender">
+    <data key="Build.BOARD" value="Xiaomi" />
+    <data key="Build.BOOTLOADER" value="qcom" />
+    <data key="Build.BRAND" value="Xiaomi" />
+    <data key="Build.CPU_ABI" value="arm64-v8a" />
+    <data key="Build.CPU_ABI2" value="armeabi-v7a" />
+    <data key="Build.DISPLAY" value="AP4A.250205.002.C1" />
+    <data key="Build.FINGERPRINT" value="xiaomi/lavender/lavender:10/QKQ1.190910.002/V12.5.3.0.QFGCNXM:user/release-keys" />
+    <data key="Build.HARDWARE" value="lavender" />
+    <data key="Build.HOST" value="ServerHere" />
+    <data key="Build.ID" value="AP4A.250205.002.C1" />
+    <data key="Build.MANUFACTURER" value="Xiaomi" />
+    <data key="Build.MODEL" value="Redmi Note 7" />
+    <data key="Build.PRODUCT" value="lavender" />
+    <data key="Build.TAGS" value="release-keys" />
+    <data key="Build.TYPE" value="user" />
+    <data key="Build.USER" value="spidy" />
+    <data key="Build.VERSION.CODENAME" value="REL" />
+    <data key="Build.VERSION.INCREMENTAL" value="eng.spidy.20250220.031430" />
+    <data key="Build.VERSION.RELEASE" value="15" />
+    <data key="Build.VERSION.SECURITY_PATCH" value="2025-02-05" />
+    <data key="Build.VERSION.SDK" value="35" />
+    <data key="Build.VERSION.SDK_INT" value="35" />
+    <data key="Build.VERSION.DEVICE_INITIAL_SDK_INT" value="29" />
+    <data key="Build.SUPPORTED_ABIS" value="arm64-v8a,armeabi-v7a,armeabi" />
+
+    <serial template="" />
+</profile>
\ No newline at end of file

From e8b5a02903d742aeb168dcd38aec838bc987cf24 Mon Sep 17 00:00:00 2001
From: Cuynu <cuynu@proton.me>
Date: Fri, 1 May 2026 14:46:20 +0700
Subject: [PATCH 2/2] Auth: improve handling of network and timeout exceptions

https://github.com/microg/GmsCore/pull/3220
Signed-off-by: Cuynu <cuynu@proton.me>
---
 .../org/microg/gms/auth/loginservice/AccountAuthenticator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/play-services-core/src/main/java/org/microg/gms/auth/loginservice/AccountAuthenticator.java b/play-services-core/src/main/java/org/microg/gms/auth/loginservice/AccountAuthenticator.java
index 89ee692f..fa4eb2bc 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/loginservice/AccountAuthenticator.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/loginservice/AccountAuthenticator.java
@@ -104,7 +104,7 @@ class AccountAuthenticator extends AbstractAccountAuthenticator {
             }
         } catch (Exception e) {
             Log.w(TAG, e);
-            return null;
+            throw new NetworkErrorException(e);
         }
         return null;
     }