commit 2cb6b267a2dd12f138222fec5a607f57ba60b9f8
author Hall Liu <hallliu@google.com> Fri Nov 08 08:08:49 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Nov 08 08:08:49 2019 -0800
tree 092b69d57d6ec2f42aa41149f069a7f401a3e8f7
parent 21db42fc8f7605f948953a5378c4500abe663587
parent d16644e69e20174a8df11c1e5dc00f778de3d1fd

Merge "Change package of CallerInfo" am: 4a1ef4a01f
am: d16644e69e

Change-Id: I454cf5a2e9139794f5cabea43932c855ecb5aa87

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 8ff0c5b..bc609e2 100644
--- a/tests/src/com/android/providers/contacts/CallLogProviderTest.java
+++ b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
@@ -16,7 +16,7 @@
 
 package com.android.providers.contacts;
 
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.providers.contacts.testutil.CommonDatabaseUtils;
 

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

diff --git a/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java b/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java
index 90ed93e..f57c060 100644
--- a/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java
+++ b/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java
@@ -22,7 +22,7 @@
 import android.provider.ContactsContract.RawContacts;
 import android.test.suitebuilder.annotation.MediumTest;
 
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
 import com.android.providers.contacts.testutil.DataUtil;
 
 /**