From 27ef1e6c1ae0a0b6b15c7ff83cbb7396d7bd976e Mon Sep 17 00:00:00 2001
From: Christine Chen <christinech@google.com>
Date: Fri, 18 Oct 2013 16:50:13 -0700
Subject: Removing private dependencies in InCallUi

- This CL addresses most of the private API calls in InCallUi.
- This CL removed Android.mk as we are not building InCallUi.apk
  separately anymore. Changes to make an unbundled app will go into
  Dialer, GoogleDialer, and Contacts apps' makefiles.
- Separated CLs will add libphonenumber, libgeocoding, and util classes
  for TelephonyManager and PhoneNumberUtils.
- The only thing left for InCallUi is to unbundle ProximitySensor.
  Currently PowerManager's functions to deal with the proximity sensor
  are all private. It will take a rather substaintial amount of work to
  implement the proximity sensor functions ourselves (read proximity
  sensor event values, ask the screen to turn on, etc.). So we should
  rather push to get those functions into the public API.

Change-Id: I18b3c52adb41c6131c1eb3c07ce32ebd56d0cc59
---
 InCallUI/src/com/android/incallui/ContactInfoCache.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'InCallUI/src/com/android/incallui/ContactInfoCache.java')

diff --git a/InCallUI/src/com/android/incallui/ContactInfoCache.java b/InCallUI/src/com/android/incallui/ContactInfoCache.java
index 45a38c7cf..c950ed417 100644
--- a/InCallUI/src/com/android/incallui/ContactInfoCache.java
+++ b/InCallUI/src/com/android/incallui/ContactInfoCache.java
@@ -25,17 +25,17 @@ import android.net.Uri;
 import android.os.Looper;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 
+import com.android.contacts.common.util.PhoneNumberHelper;
 import com.android.incallui.service.PhoneNumberService;
 import com.android.incalluibind.ServiceFactory;
 import com.android.services.telephony.common.Call;
 import com.android.services.telephony.common.CallIdentification;
 import com.android.services.telephony.common.MoreStrings;
-import com.google.android.collect.Lists;
-import com.google.android.collect.Maps;
-import com.google.android.collect.Sets;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 
@@ -375,7 +375,7 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete
             String number = info.phoneNumber;
 
             if (!TextUtils.isEmpty(number)) {
-                isSipCall = PhoneNumberUtils.isUriNumber(number);
+                isSipCall = PhoneNumberHelper.isUriNumber(number);
                 if (number.startsWith("sip:")) {
                     number = number.substring(4);
                 }
-- 
cgit v1.2.3