commit f28dac6e6f9fcbcbdd27e7cdb2db721035f88043
author Yichun Li <yichunli@google.com> Tue Apr 25 17:52:44 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 25 17:52:44 2023 +0000
tree 23e4136d432488af59288a8d2969ccd899b90cde
parent bcc9a0461d70e02249bf9732cbf67d3d4904eef8
parent c943f4de68d1e3190de1642c3fc3f7374e91ac34

Merge "Update uiautomator references in packages/apps/Contacts/tests"

src/com/android/contacts/util/ImplicitIntentsUtil.java

diff --git a/src/com/android/contacts/util/ImplicitIntentsUtil.java b/src/com/android/contacts/util/ImplicitIntentsUtil.java
index a1ab896..e1377e0 100644
--- a/src/com/android/contacts/util/ImplicitIntentsUtil.java
+++ b/src/com/android/contacts/util/ImplicitIntentsUtil.java
@@ -30,6 +30,8 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 
+import androidx.core.os.BuildCompat;
+
 import com.android.contacts.logging.ScreenEvent.ScreenType;
 import com.android.contacts.model.account.GoogleAccountType;
 import com.android.contacts.quickcontact.QuickContactActivity;
@@ -140,6 +142,9 @@
     public static Intent getIntentForAddingAccount() {
         final Intent intent = new Intent(Settings.ACTION_SYNC_SETTINGS);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        if (BuildCompat.isAtLeastU()) {
+            intent.setData(Uri.fromParts("package", "com.android.contacts", null));
+        }
         intent.putExtra(Settings.EXTRA_AUTHORITIES,
                 new String[]{ContactsContract.AUTHORITY});
         return intent;