commit 155ef41fe68ac75fab69481d051f61c181ff881b
author Stuart Scott <stuartscott@google.com> Fri Oct 31 12:02:08 2014 -0700
committer Stuart Scott <stuartscott@google.com> Mon Nov 03 15:13:13 2014 -0800
tree 515dccd544e3b629edc8c3ce7a85ac150878759d
parent 1fd7e1e789c4a6ba8c81d9056b73a9237e2ee921

Clean up public API of SubInfoRecord.

bug: 17575308
Change-Id: I80472fe13887b6ed3bfc422abbbe4644a6d6dcf5

src/com/android/contacts/common/interactions/ImportExportDialogFragment.java

diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
index c6483cc..41bf304 100644
--- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
+++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
@@ -120,11 +120,11 @@
             final List<SubInfoRecord> subInfoRecords = getAllSubInfoList();
             if (subInfoRecords.size() == 1) {
                 adapter.add(new AdapterEntry(getString(R.string.import_from_sim),
-                        R.string.import_from_sim, subInfoRecords.get(0).subId));
+                        R.string.import_from_sim, subInfoRecords.get(0).getSubscriptionId()));
             } else {
                 for (SubInfoRecord record : subInfoRecords) {
                     adapter.add(new AdapterEntry(getSubDescription(record),
-                            R.string.import_from_sim, record.subId));
+                            R.string.import_from_sim, record.getSubscriptionId()));
                 }
             }
         }
@@ -294,11 +294,12 @@
     }
 
     private String getSubDescription(SubInfoRecord record) {
-        if (TextUtils.isEmpty(record.number)) {
+        CharSequence name = record.getDisplayName();
+        if (TextUtils.isEmpty(record.getNumber())) {
             // Don't include the phone number in the description, since we don't know the number.
-            return getString(R.string.import_from_sim_summary_no_number, record.displayName);
+            return getString(R.string.import_from_sim_summary_no_number, name);
         }
-        return getString(R.string.import_from_sim_summary, record.displayName, record.number);
+        return getString(R.string.import_from_sim_summary, name, record.getNumber());
     }
 
     private static class AdapterEntry {