contacts-common: Update for multisim APIs

Change-Id: Ia0cb350075bf468cbeb053ff436fc5e9baf65509

2 files changed, 4 insertions, 4 deletions

diff --git a/src/com/android/contacts/common/MoreContactUtils.java b/src/com/android/contacts/common/MoreContactUtils.java
index c76e289a..7e96c62a 100644
--- a/src/com/android/contacts/common/MoreContactUtils.java
+++ b/src/com/android/contacts/common/MoreContactUtils.java
@@ -876,7 +876,7 @@ public class MoreContactUtils {
     public static PhoneAccountHandle getAccount(int slot) {
         ComponentName serviceName = new ComponentName("com.android.phone",
                 "com.android.services.telephony.TelephonyConnectionService");
-        long[] subId = SubscriptionManager.getSubId(slot);
+        int[] subId = SubscriptionManager.getSubId(slot);
         return new PhoneAccountHandle(serviceName, String.valueOf(subId[0]));
     }
 
diff --git a/src/com/android/contacts/common/util/TelephonyManagerUtils.java b/src/com/android/contacts/common/util/TelephonyManagerUtils.java
index 1334bec6..374743d1 100644
--- a/src/com/android/contacts/common/util/TelephonyManagerUtils.java
+++ b/src/com/android/contacts/common/util/TelephonyManagerUtils.java
@@ -113,7 +113,7 @@ public class TelephonyManagerUtils {
         if (account == null) {
             return null;
         }
-        return account.getIcon(context);
+        return account.createIconDrawable(context);
     }
 
     public static Drawable getMultiSimIcon(Context context, int subscription) {
@@ -122,7 +122,7 @@ public class TelephonyManagerUtils {
             return null;
         }
 
-        long subId[] = SubscriptionManager.getSubId(subscription);
+        int subId[] = SubscriptionManager.getSubId(subscription);
         if (subId == null) {
             return null;
         }
@@ -141,6 +141,6 @@ public class TelephonyManagerUtils {
         }
         final PhoneAccount account = telecomManager
                 .getPhoneAccount(phoneAccountHandle);
-        return account.getIcon(context);
+        return account.createIconDrawable(context);
     }
 }