commit 76c06332bb0dcabad6c221b84a82f1813f289315
author Marcus Hagerott <mhagerott@google.com> Tue Nov 08 13:33:50 2016 -0800
committer Marcus Hagerott <mhagerott@google.com> Tue Nov 08 21:49:17 2016 +0000
tree 360a1e32e201bb3c5fe073e3e9495b4d21be8d0a
parent 9970f301c1944c3d8155e1718ac34abbe8f69199

Fix error in SIM imported state

The imported and dismissed flags were flipped

Test
see I24df1f6b658644aaf84edbf12eba9711ff4d1999

Bug 32698786

Change-Id: I221a5a3a0eefe8e95ff956ea260a04f4cf898df3

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) {