commit dab20159eff14d09c82c86c839cc0a404a350659
author The Android Automerger <android-build@google.com> Tue Aug 04 01:05:32 2015 -0700
committer The Android Automerger <android-build@google.com> Tue Aug 04 01:05:32 2015 -0700
tree a903d0d32af4da386665da1f4cb4f38e59aabc0a
parent 07b5ddba9ab6f28f730597e52c0f0c2cc319d36d
parent 6154edf77cc349a2a6523b9abc4edbefc7d85ff5

merge in mnc-release history after reset to mnc-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 32e0988..189483d 100644
--- a/tests/src/com/android/providers/contacts/CallLogProviderTest.java
+++ b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
@@ -197,9 +197,10 @@
         values.put(Calls.NUMBER_PRESENTATION, Calls.PRESENTATION_ALLOWED);
         values.put(Calls.DATE, 2000);
         values.put(Calls.DURATION, 40);
-        values.put(Calls.CACHED_NAME, "1-800-GOOG-411");
-        values.put(Calls.CACHED_NUMBER_TYPE, Phone.TYPE_CUSTOM);
-        values.put(Calls.CACHED_NUMBER_LABEL, "Directory");
+        // 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_NUMBER_TYPE, (String) null);
+        values.put(Calls.CACHED_NUMBER_LABEL, (String) null);
         values.put(Calls.COUNTRY_ISO, "us");
         values.put(Calls.GEOCODED_LOCATION, "usa");
         values.put(Calls.PHONE_ACCOUNT_COMPONENT_NAME,