From 1560da55d0566b5378930864eb6a82307b8e058b Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 3 Sep 2025 15:42:20 +0300 Subject: [PATCH] Merge tag 'android-security-15.0.0_r10' into staging/lineage-22.2_merge-android-security-15.0.0_r10 Android Security 15.0.0 Release 10 (13793697) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaLciswAKCRDorT+BmrEO # eNYVAJ0byrnPGY3NVm4O4GUJOHjrtox6EgCeIHnb+Dt4Jn+zDIhU6+vvqhQk0fs= # =I2KA # -----END PGP SIGNATURE----- # gpg: Signature made Tue Sep 2 20:00:35 2025 EEST # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project " [ultimate] * tag 'android-security-15.0.0_r10': Show account selection dialog when a single account exists. Change-Id: I55aaa208fff9c422f93827750d1e62d72b0248f6 --- .../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