From 6104890ea916f5f8951cc944530a99efea64e71c Mon Sep 17 00:00:00 2001
From: Kelly Ng <ngkelly@google.com>
Date: Tue, 3 Jun 2025 11:54:07 -0700
Subject: [PATCH 1/2] Show account selection dialog when a single account
 exists.

- Recommended fix by security team to prevent auto-importing when there is a single account (see b/388032224#comment4)

FIX: 388032224
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:615666035723ff1828ff24674209012f30082de9)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:222b7a98077955702e05ee6a65d1daa1398728f3)
Merged-In: I83f046c24d45e076aa783e5551b42dcbaacd0ad6
Change-Id: I83f046c24d45e076aa783e5551b42dcbaacd0ad6
---
 .../android/contacts/vcard/SelectAccountActivity.java    | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/com/android/contacts/vcard/SelectAccountActivity.java b/src/com/android/contacts/vcard/SelectAccountActivity.java
index 8ead5fab30..797fc8670c 100644
--- a/src/com/android/contacts/vcard/SelectAccountActivity.java
+++ b/src/com/android/contacts/vcard/SelectAccountActivity.java
@@ -65,15 +65,6 @@ public class SelectAccountActivity extends Activity {
             Log.w(LOG_TAG, "Account does not exist");
             finish();
             return;
-        } else if (accountList.size() == 1) {
-            final AccountWithDataSet account = accountList.get(0);
-            final Intent intent = new Intent();
-            intent.putExtra(ACCOUNT_NAME, account.name);
-            intent.putExtra(ACCOUNT_TYPE, account.type);
-            intent.putExtra(DATA_SET, account.dataSet);
-            setResult(RESULT_OK, intent);
-            finish();
-            return;
         }
 
         Log.i(LOG_TAG, "The number of available accounts: " + accountList.size());
-- 
GitLab


From 1534449bebe483c7cc3709c228a89ab42a5bd1ae Mon Sep 17 00:00:00 2001
From: LineageOS Infra <infra@lineageos.org>
Date: Tue, 15 Jul 2025 15:29:27 +0000
Subject: [PATCH 2/2] Automatic translation import

Change-Id: If33071ed7f1f95e41680f016c44319cccc5b2dd9
---
 res/values-ug/lineage_strings.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 res/values-ug/lineage_strings.xml

diff --git a/res/values-ug/lineage_strings.xml b/res/values-ug/lineage_strings.xml
new file mode 100644
index 0000000000..befc98589d
--- /dev/null
+++ b/res/values-ug/lineage_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2018 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="menu_emergency_information_txt">جىددىي ئالاقە ئۇچۇرى</string>
+    <string name="call_via_template"><xliff:g id="account">%1$s</xliff:g> ئارقىلىق چاقىر</string>
+</resources>
-- 
GitLab