commit 04091a79059cffee8ff53c5fd30244223af1fcb6
author Wink Saville <wink@google.com> Wed Jul 11 18:04:31 2012 -0700
committer Wink Saville <wink@google.com> Wed Jul 11 18:04:31 2012 -0700
tree 4d5a476a4e0c9b06224a2add7c99c24b3854c1c6
parent 03ab0c82c4ec7ee4dec8fc093f65e40fe3f222f1
parent e0c5d80d5634a9c7d431fa4490d7504486b5ce25

Merge commit 'e0c5d80d' into mit

* commit 'e0c5d80d':
  Use telephony-common

Change-Id: I56b4a75ac390e7710d3c3a9275a68c5dd6d20c2c

Android.mk

diff --git a/Android.mk b/Android.mk
index 634ef9f..df4d245 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,7 +8,7 @@
 LOCAL_SRC_FILES += \
         src/com/android/providers/contacts/EventLogTags.logtags
 
-LOCAL_JAVA_LIBRARIES := ext
+LOCAL_JAVA_LIBRARIES := ext telephony-common
 
 LOCAL_STATIC_JAVA_LIBRARIES += android-common com.android.vcard guava
 

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 302df4d..05f8c25 100644
--- a/tests/src/com/android/providers/contacts/CallLogProviderTest.java
+++ b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
@@ -16,6 +16,9 @@
 
 package com.android.providers.contacts;
 
+import com.android.internal.telephony.CallerInfo;
+import com.android.internal.telephony.PhoneConstants;
+
 import android.content.ContentProvider;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -32,9 +35,6 @@
 import android.provider.VoicemailContract.Voicemails;
 import android.test.suitebuilder.annotation.MediumTest;
 
-import com.android.internal.telephony.CallerInfo;
-import com.android.internal.telephony.Connection;
-
 import java.util.Arrays;
 import java.util.List;
 
@@ -180,7 +180,7 @@
         ci.numberType = Phone.TYPE_CUSTOM;
         ci.numberLabel = "Directory";
         Uri uri = Calls.addCall(ci, getMockContext(), "1-800-263-7643",
-                Connection.PRESENTATION_ALLOWED, Calls.OUTGOING_TYPE, 2000, 40);
+                PhoneConstants.PRESENTATION_ALLOWED, Calls.OUTGOING_TYPE, 2000, 40);
 
         ContentValues values = new ContentValues();
         values.put(Calls.TYPE, Calls.OUTGOING_TYPE);