commit d16644e69e20174a8df11c1e5dc00f778de3d1fd
author Hall Liu <hallliu@google.com> Fri Nov 08 07:58:24 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Nov 08 07:58:24 2019 -0800
tree 092b69d57d6ec2f42aa41149f069a7f401a3e8f7
parent c5f3b4c958f8ca065949be3ae3313fc0988e2a4c
parent 4a1ef4a01f6f7f50953ff0ba64917f571b8de5a0

Merge "Change package of CallerInfo"
am: 4a1ef4a01f

Change-Id: Iffba5dbbcf7f457eb844d5e3b6feedb1bdb7b7a1

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;
 
 /**