Build fix.

Change-Id: I6a2104488960553190d3b8539d31996b5ec237dd

13 files changed, 32 insertions, 35 deletions

diff --git a/src/com/android/dialer/CallDetailHeader.java b/src/com/android/dialer/CallDetailHeader.java
index 50b1f5927..43ab26737 100644
--- a/src/com/android/dialer/CallDetailHeader.java
+++ b/src/com/android/dialer/CallDetailHeader.java
@@ -86,6 +86,7 @@ public class CallDetailHeader {
         CharSequence getFormattedNumber();
         Uri getContactUri();
         Uri getPhotoUri();
+        int getAccountId();
         CharSequence getAccountLabel();
         CharSequence getGeocode();
     }
@@ -112,7 +113,7 @@ public class CallDetailHeader {
         final CharSequence dataAccount = data.getAccountLabel();
         final CharSequence callLocationOrType = getNumberTypeOrLocation(data);
 
-        final CharSequence displayNumber = mPhoneNumberHelper.getDisplayNumber(
+        final CharSequence displayNumber = mPhoneNumberHelper.getDisplayNumber(data.getAccountId(),
                 dataNumber, data.getNumberPresentation(), data.getFormattedNumber());
         final String displayNumberStr = mBidiFormatter.unicodeWrap(
                 displayNumber.toString(), TextDirectionHeuristics.LTR);
@@ -172,7 +173,8 @@ public class CallDetailHeader {
 
         String nameForDefaultImage;
         if (TextUtils.isEmpty(data.getName())) {
-            nameForDefaultImage = mPhoneNumberHelper.getDisplayNumber(data.getNumber(),
+            nameForDefaultImage = mPhoneNumberHelper.getDisplayNumber(
+                    data.getAccountId(), data.getNumber(),
                     data.getNumberPresentation(), data.getFormattedNumber()).toString();
         } else {
             nameForDefaultImage = data.getName().toString();
diff --git a/src/com/android/dialer/PhoneCallDetails.java b/src/com/android/dialer/PhoneCallDetails.java
index ef66689b6..37c619888 100755
--- a/src/com/android/dialer/PhoneCallDetails.java
+++ b/src/com/android/dialer/PhoneCallDetails.java
@@ -139,10 +139,10 @@ public class PhoneCallDetails implements CallDetailHeader.Data {
             int[] callTypes, long date, long duration, CharSequence name,
             int numberType, CharSequence numberLabel, Uri contactUri,
             Uri photoUri, int sourceType, String accountLabel, Drawable accountIcon, int features,
-            Long dataUsage, String transcription) {
+            Long dataUsage, String transcription, int accountId) {
        this(number, numberPresentation, formattedNumber, countryIso, geocode, callTypes,
                date, duration, name, numberType, numberLabel, contactUri, photoUri, sourceType,
-               accountLabel, accountIcon, features, dataUsage, transcription, DEFAULT_PHONE_ID,
+               accountLabel, accountIcon, features, dataUsage, transcription, accountId,
                Calls.DURATION_TYPE_ACTIVE);
     }
 
@@ -209,6 +209,10 @@ public class PhoneCallDetails implements CallDetailHeader.Data {
         return photoUri;
     }
     @Override
+    public int getAccountId() {
+        return accountId;
+    }
+    @Override
     public CharSequence getAccountLabel() {
         return accountLabel;
     }
diff --git a/src/com/android/dialer/calllog/CallLogActivity.java b/src/com/android/dialer/calllog/CallLogActivity.java
index de4f89c33..bc3996360 100755
--- a/src/com/android/dialer/calllog/CallLogActivity.java
+++ b/src/com/android/dialer/calllog/CallLogActivity.java
@@ -87,24 +87,6 @@ public class CallLogActivity extends AnalyticsActivity implements
         }
 
         @Override
-        public Object instantiateItem(ViewGroup container, int position) {
-            final CallLogFragment fragment =
-                    (CallLogFragment) super.instantiateItem(container, position);
-            switch (position) {
-                case TAB_INDEX_ALL:
-                    mAllCallsFragment = fragment;
-                    break;
-                case TAB_INDEX_MISSED:
-                    mMissedCallsFragment = fragment;
-                    break;
-                case TAB_INDEX_VOICEMAIL:
-                    mVoicemailFragment = fragment;
-                    break;
-            }
-            return fragment;
-        }
-
-        @Override
         public CharSequence getPageTitle(int position) {
             return mTabTitles[position];
         }
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index fbde552ad..16f64aaaf 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -413,7 +413,7 @@ public class CallLogFragment extends AnalyticsListFragment
 
     @Override
     public void fetchCalls() {
-        fetchCalls(-1, -1, CallLogQueryHandler.CALL_SUB_ALL);
+        fetchCalls(-1, -1, CallLogQueryHandler.CALL_SIM_ALL);
     }
 
     protected void fetchCalls(long filterFromDate, long filterToDate, int subId) {
diff --git a/src/com/android/dialer/calllog/CallLogQueryHandler.java b/src/com/android/dialer/calllog/CallLogQueryHandler.java
index 8093d15c1..23f8fb9a2 100644
--- a/src/com/android/dialer/calllog/CallLogQueryHandler.java
+++ b/src/com/android/dialer/calllog/CallLogQueryHandler.java
@@ -164,7 +164,7 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
     /** Fetches the list of calls in the call log. */
     private void fetchCalls(int token, int callType, boolean newOnly,
                             long olderThan, long newerThan) {
-        fetchCalls(token, callType, newOnly, olderThan, newerThan, CALL_SUB_ALL);
+        fetchCalls(token, callType, newOnly, olderThan, newerThan, CALL_SIM_ALL);
     }
 
     private void fetchCalls(int token, int callType, boolean newOnly,
diff --git a/src/com/android/dialer/calllog/MSimCallLogFragment.java b/src/com/android/dialer/calllog/MSimCallLogFragment.java
index 4cb9902b9..193059a4c 100644
--- a/src/com/android/dialer/calllog/MSimCallLogFragment.java
+++ b/src/com/android/dialer/calllog/MSimCallLogFragment.java
@@ -176,14 +176,14 @@ public class MSimCallLogFragment extends CallLogFragment
             // Update the sub filter's content.
             ArrayAdapter<SpinnerContent> filterSlotAdapter = new ArrayAdapter<SpinnerContent>(
                     this.getActivity(), R.layout.call_log_spinner_item,
-                    SpinnerContent.setupSlotFilterContent(getActivity()));
+                    SpinnerContent.setupSubFilterContent(getActivity()));
 
             if (filterSlotAdapter.getCount() <= 1) {
                 mFilterSlotSpinnerView.setVisibility(View.GONE);
             } else {
                 mCallSlotFilter = getSelectedSlot();
                 mFilterSlotSpinnerView.setAdapter(filterSlotAdapter);
-                mFilterSlotSpinnerView.setOnItemSelectedListener(mSlotSelectedListener);
+                mFilterSlotSpinnerView.setOnItemSelectedListener(mSubSelectedListener);
                 SpinnerContent.setSpinnerContentValue(mFilterSlotSpinnerView, mCallSlotFilter);
             }
         }
diff --git a/src/com/android/dialer/calllog/SpinnerContent.java b/src/com/android/dialer/calllog/SpinnerContent.java
index 9679dd5db..721e3d208 100644
--- a/src/com/android/dialer/calllog/SpinnerContent.java
+++ b/src/com/android/dialer/calllog/SpinnerContent.java
@@ -75,7 +75,7 @@ public class SpinnerContent {
         int count = telephonyManager.getPhoneCount();
         // Update the filter sub content.
         ArrayList<SpinnerContent> values = new ArrayList<SpinnerContent>(count + 1);
-        values.add(new SpinnerContent(CallLogQueryHandler.CALL_SUB_ALL,
+        values.add(new SpinnerContent(CallLogQueryHandler.CALL_SIM_ALL,
                 context.getString(R.string.call_log_show_all_slots)));
         for (int i = 0; i < count; i++) {
             String subDisplayName = PhoneAccountUtils.getAccountLabel(context,
diff --git a/src/com/android/dialer/callstats/CallStatsAdapter.java b/src/com/android/dialer/callstats/CallStatsAdapter.java
index 7cf35ef19..fa59dd726 100644
--- a/src/com/android/dialer/callstats/CallStatsAdapter.java
+++ b/src/com/android/dialer/callstats/CallStatsAdapter.java
@@ -20,6 +20,7 @@ package com.android.dialer.callstats;
 import android.content.Context;
 import android.content.res.Resources;
 import android.net.Uri;
+import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -220,7 +221,8 @@ class CallStatsAdapter extends ArrayAdapter<CallStatsDetails>
 
         String nameForDefaultImage = null;
         if (TextUtils.isEmpty(details.name)) {
-            nameForDefaultImage = mPhoneNumberHelper.getDisplayNumber(details.number,
+            nameForDefaultImage = mPhoneNumberHelper.getDisplayNumber(
+                    SubscriptionManager.INVALID_SUBSCRIPTION_ID, details.number,
                     details.numberPresentation, details.formattedNumber).toString();
         } else {
             nameForDefaultImage = details.name;
diff --git a/src/com/android/dialer/callstats/CallStatsDetailHelper.java b/src/com/android/dialer/callstats/CallStatsDetailHelper.java
index 46ac03c70..848944060 100644
--- a/src/com/android/dialer/callstats/CallStatsDetailHelper.java
+++ b/src/com/android/dialer/callstats/CallStatsDetailHelper.java
@@ -21,6 +21,7 @@ import android.content.res.Resources;
 import android.provider.CallLog.Calls;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.telephony.PhoneNumberUtils;
+import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
@@ -61,7 +62,8 @@ public class CallStatsDetailHelper {
         final CharSequence numberText;
         final CharSequence labelText;
         final CharSequence displayNumber = mPhoneNumberHelper.getDisplayNumber(
-                details.number, details.numberPresentation, details.formattedNumber);
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID, details.number,
+                details.numberPresentation, details.formattedNumber);
 
         if (TextUtils.isEmpty(details.name)) {
             nameText = displayNumber;
diff --git a/src/com/android/dialer/callstats/CallStatsDetails.java b/src/com/android/dialer/callstats/CallStatsDetails.java
index 8184be04a..e5d81cf1e 100644
--- a/src/com/android/dialer/callstats/CallStatsDetails.java
+++ b/src/com/android/dialer/callstats/CallStatsDetails.java
@@ -21,6 +21,7 @@ import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.provider.CallLog.Calls;
+import android.telephony.SubscriptionManager;
 import android.util.Log;
 
 import com.android.dialer.CallDetailHeader;
@@ -97,6 +98,10 @@ public class CallStatsDetails implements CallDetailHeader.Data, Parcelable {
         return photoUri;
     }
     @Override
+    public int getAccountId() {
+        return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+    }
+    @Override
     public CharSequence getAccountLabel() {
         return null;
     }
diff --git a/src/com/android/dialer/callstats/CallStatsFragment.java b/src/com/android/dialer/callstats/CallStatsFragment.java
index a1f87be9f..6512610eb 100644
--- a/src/com/android/dialer/callstats/CallStatsFragment.java
+++ b/src/com/android/dialer/callstats/CallStatsFragment.java
@@ -69,7 +69,7 @@ public class CallStatsFragment extends ListFragment implements
     private Spinner mFilterStatusSpinnerView;
 
     // Default to all slots.
-    private int mCallSubFilter = CallStatsQueryHandler.CALL_SUB_ALL;
+    private int mCallSubFilter = CallStatsQueryHandler.CALL_SIM_ALL;
 
     private TextView mSumHeaderView;
     private TextView mDateFilterView;
diff --git a/src/com/android/dialer/callstats/CallStatsQueryHandler.java b/src/com/android/dialer/callstats/CallStatsQueryHandler.java
index 9cc02874d..b61a3a6d4 100644
--- a/src/com/android/dialer/callstats/CallStatsQueryHandler.java
+++ b/src/com/android/dialer/callstats/CallStatsQueryHandler.java
@@ -55,7 +55,7 @@ public class CallStatsQueryHandler extends AsyncQueryHandler {
     /**
      * To specify all slots.
      */
-    public static final int CALL_SUB_ALL = -1;
+    public static final int CALL_SIM_ALL = -1;
 
     private static final String TAG = "CallStatsQueryHandler";
 
@@ -124,14 +124,14 @@ public class CallStatsQueryHandler extends AsyncQueryHandler {
             selection.append(String.format("(%s < ?)", Calls.DATE));
             selectionArgs.add(String.valueOf(to));
         }
-        if (slotId > CALL_SUB_ALL) {
-            long[] subId = SubscriptionManager.getSubId(slotId);
+        if (slotId > CALL_SIM_ALL) {
+            int[] subId = SubscriptionManager.getSubId(slotId);
             if (subId != null && subId.length >= 1) {
                 if (selection.length() > 0) {
                     selection.append(" AND ");
                 }
                 selection.append(String.format("(%s = ?)", Calls.PHONE_ACCOUNT_ID));
-                selectionArgs.add(Long.toString(subId[0]));
+                selectionArgs.add(Integer.toString(subId[0]));
             }
         }
 
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index e5e3197f1..089261f1f 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -1190,7 +1190,7 @@ public class DialpadFragment extends AnalyticsFragment
     private void ipCallBySlot(int slotId) {
         String prefix = MoreContactUtils.getIPCallPrefix(mContext, slotId);
         if (!TextUtils.isEmpty(prefix)) {
-            long[] subId = SubscriptionManager.getSubId(slotId);
+            int[] subId = SubscriptionManager.getSubId(slotId);
             if (subId != null && subId.length >= 1) {
                 ComponentName serviceName =
                         new ComponentName("com.android.phone",