summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2014-10-23 10:25:58 -0700
committerWink Saville <wink@google.com>2014-10-23 15:45:58 -0700
commitd09e43ca0bd57c25cbd4e4a87bff0b9fc10a1459 (patch)
tree4d2c865b4a6cf323826e4762195e675fcdeab329 /src
parentf938fa22b0901d9a566be1ec3975554f3623f795 (diff)
downloadandroid_packages_apps_ContactsCommon-d09e43ca0bd57c25cbd4e4a87bff0b9fc10a1459.tar.gz
android_packages_apps_ContactsCommon-d09e43ca0bd57c25cbd4e4a87bff0b9fc10a1459.tar.bz2
android_packages_apps_ContactsCommon-d09e43ca0bd57c25cbd4e4a87bff0b9fc10a1459.zip
Change subId to int from long
Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
Diffstat (limited to 'src')
-rw-r--r--src/com/android/contacts/common/interactions/ImportExportDialogFragment.java6
-rw-r--r--src/com/android/contacts/common/util/AccountSelectionUtil.java4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
index 6bfd42ac..954fc69e 100644
--- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
+++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
@@ -303,12 +303,12 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment
private static class AdapterEntry {
public final String mLabel;
public final int mChoiceResourceId;
- public final long mSubscriptionId;
+ public final int mSubscriptionId;
- public AdapterEntry(String label, int resId, long subscriptionId) {
+ public AdapterEntry(String label, int resId, int subId) {
mLabel = label;
mChoiceResourceId = resId;
- mSubscriptionId = subscriptionId;
+ mSubscriptionId = subId;
}
public AdapterEntry(String label, int resId) {
diff --git a/src/com/android/contacts/common/util/AccountSelectionUtil.java b/src/com/android/contacts/common/util/AccountSelectionUtil.java
index 68217b94..da30e89a 100644
--- a/src/com/android/contacts/common/util/AccountSelectionUtil.java
+++ b/src/com/android/contacts/common/util/AccountSelectionUtil.java
@@ -55,12 +55,12 @@ public class AccountSelectionUtil {
final private Context mContext;
final private int mResId;
- final private long mSubscriptionId;
+ final private int mSubscriptionId;
final protected List<AccountWithDataSet> mAccountList;
public AccountSelectedListener(Context context, List<AccountWithDataSet> accountList,
- int resId, long subscriptionId) {
+ int resId, int subscriptionId) {
if (accountList == null || accountList.size() == 0) {
Log.e(LOG_TAG, "The size of Account list is 0.");
}