commit 7895220aa510853f24e06b910abdfd827b314986
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Nov 08 22:02:36 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 08 22:02:37 2016 +0000
tree 53dbcce82860d1b56a0b51e6f2f51a097b32c3a3
parent ee9af7bad7b359c5f89072cc15506a96a91a2cac
parent 76c06332bb0dcabad6c221b84a82f1813f289315

Merge "Fix error in SIM imported state" into ub-contactsdialer-h-dev

src/com/android/contacts/common/database/SimContactDao.java

diff --git a/src/com/android/contacts/common/database/SimContactDao.java b/src/com/android/contacts/common/database/SimContactDao.java
index ee36645..7c8b6a0 100644
--- a/src/com/android/contacts/common/database/SimContactDao.java
+++ b/src/com/android/contacts/common/database/SimContactDao.java
@@ -183,7 +183,7 @@
     }
 
     public SimCard getSimBySubscriptionId(int subscriptionId) {
-        final List<SimCard> sims = getSimCards();
+        final List<SimCard> sims = SharedPreferenceUtil.restoreSimStates(mContext, getSimCards());
         if (subscriptionId == SimCard.NO_SUBSCRIPTION_ID && !sims.isEmpty()) {
             return sims.get(0);
         }

src/com/android/contacts/common/model/SimCard.java

diff --git a/src/com/android/contacts/common/model/SimCard.java b/src/com/android/contacts/common/model/SimCard.java
index 2d17cd4..7b13096 100644
--- a/src/com/android/contacts/common/model/SimCard.java
+++ b/src/com/android/contacts/common/model/SimCard.java
@@ -184,7 +184,7 @@
     }
 
     public SimCard withDismissedState(boolean dismissed) {
-        return withImportAndDismissStates(dismissed, mImported);
+        return withImportAndDismissStates(mImported, dismissed);
     }
 
     public SimCard withContacts(List<SimContact> contacts) {