commit 4387625574c26c8431d23d0f94018264046c866b
author Makoto Onuki <omakoto@google.com> Thu May 30 20:33:06 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 30 20:33:06 2019 +0000
tree c00f65dccf0e0987587b478a7511403a49d57ed6
parent 968e41783da70313e0379abe79b7bbb2af1e6a31
parent 449d2b7a8f3f3b12c19eee44939eee181f97e9af

Merge "Detect country change at runtime too" into qt-dev

tests/src/com/android/providers/contacts/CallLogProviderTest.java

diff --git a/tests/src/com/android/providers/contacts/CallLogProviderTest.java b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
index babfaff..93806e0 100644
--- a/tests/src/com/android/providers/contacts/CallLogProviderTest.java
+++ b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
@@ -202,8 +202,7 @@
         values.put(Calls.NUMBER_PRESENTATION, Calls.PRESENTATION_ALLOWED);
         values.put(Calls.DATE, 2000);
         values.put(Calls.DURATION, 40);
-        // Cached values should not be updated immediately by the framework when inserting the call.
-        values.put(Calls.CACHED_NAME, (String) null);
+        values.put(Calls.CACHED_NAME, ci.name);
         values.put(Calls.CACHED_NUMBER_TYPE, (String) null);
         values.put(Calls.CACHED_NUMBER_LABEL, (String) null);
         values.put(Calls.COUNTRY_ISO, "us");

tests/src/com/android/providers/contacts/ContactsProvider2Test.java

diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index 88e32e6..32a0306 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -743,6 +743,8 @@
                 PhoneLookup.TYPE,
                 PhoneLookup.LABEL,
                 PhoneLookup.NORMALIZED_NUMBER,
+                Data.PREFERRED_PHONE_ACCOUNT_COMPONENT_NAME,
+                Data.PREFERRED_PHONE_ACCOUNT_ID,
         });
     }
 
@@ -777,6 +779,8 @@
                         PhoneLookup.TYPE,
                         PhoneLookup.LABEL,
                         PhoneLookup.NORMALIZED_NUMBER,
+                        Data.PREFERRED_PHONE_ACCOUNT_COMPONENT_NAME,
+                        Data.PREFERRED_PHONE_ACCOUNT_ID,
                 });
     }