Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 757e19f2 authored by Matt Garnes's avatar Matt Garnes Committed by Raj Yengisetty
Browse files

Contacts: fix exporting SIM contacts the first time 

Iff the ICC cache hasn't populated before the cursor query - let it
populate, then get the free count.

Change-Id: I1d5b3f265eec4e6aa4d05c72c1b735ed9f34269d
parent 7083e611

src/com/android/contacts/quickcontact/QuickContactActivity.java

+25 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.ResolveInfo;

import android.content.res.Resources;

import android.database.Cursor;

import android.graphics.Bitmap;

import android.graphics.BitmapFactory;

import android.graphics.Color;
@@ -78,6 +79,7 @@ import android.provider.ContactsContract.RawContacts; 
import android.support.v7.graphics.Palette;

import android.telecom.PhoneAccount;

import android.telecom.TelecomManager;

import android.telephony.SubscriptionManager;

import android.text.BidiFormatter;

import android.text.TextDirectionHeuristics;

import android.text.TextUtils;
@@ -2694,6 +2696,29 @@ public class QuickContactActivity extends ContactsActivity { 
                    int adnCountInSimContact = 1;

                    int anrCountInSimContact = 0;

                    int emailCountInSimContact = 0;



                    Cursor cr = null;

                    // call query first, otherwise the count queries will fail

                    try{

                        long[] subId = SubscriptionManager.getSubId(sub);

                        if (subId != null

                            && TelephonyManager.getDefault().isMultiSimEnabled()) {

                            cr = getContentResolver().query(

                                Uri.parse(SimContactsConstants.SIM_SUB_URI

                                    + subId[0]), null, null, null, null);

                        } else {

                            cr = getContentResolver().query(

                                Uri.parse(SimContactsConstants.SIM_URI), null,

                                null, null, null);

                        }

                    } catch (NullPointerException e) {

                        Log.e(TAG, "Exception:" + e);

                    } finally {

                        if (cr != null) {

                            cr.close();

                        }

                    }



                    if (MoreContactUtils.canSaveAnr(sub)) {

                        anrCountInSimContact = MoreContactUtils.getOneSimAnrCount(sub);

                    }