Promotion of android_ui.lnx.2.1-00026.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1081360   Ia1514717b80172c949f112d8f1939d28734d0989   Fix NullPointerException during import vcard
1080625   Ia0fe990bc96fee8b448caf697a5c5aaa275a7b13   Fix ServiceConnectionLeaked during import vcard
1076330   Ie307c91d74749831d0d2cc3340c0a25613a554aa   Fix can export sim contact number more than 40 digits

Change-Id: I824a365be235fc627f51f94617fe9d8b3a6ceb62
CRs-Fixed: 1081360, 1076330, 1080625

3 files changed, 23 insertions, 21 deletions

diff --git a/src/com/android/contacts/common/MoreContactUtils.java b/src/com/android/contacts/common/MoreContactUtils.java
index 0c29f722..77f2bdab 100755
--- a/src/com/android/contacts/common/MoreContactUtils.java
+++ b/src/com/android/contacts/common/MoreContactUtils.java
@@ -674,10 +674,6 @@ public class MoreContactUtils {
         mValues.put(SimContactsConstants.STR_TAG, name);
         if (!TextUtils.isEmpty(number)) {
             number = PhoneNumberUtils.stripSeparators(number);
-            if (number.length() > MAX_LENGTH_NUMBER_IN_SIM) {
-                number = number.substring(0, MAX_LENGTH_NUMBER_IN_SIM);
-            }
-
             mValues.put(SimContactsConstants.STR_NUMBER, number);
         }
         if (!TextUtils.isEmpty(emails)) {
diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
index 6477f66e..c231ab23 100755
--- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
+++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
@@ -624,11 +624,6 @@ public class ImportExportDialogFragment extends DialogFragment
                                     for (int j = 1; j < phoneCountInOneSimContact; j++) {
                                         if (arrayNumber.size() > 0 && emptyAnr-- > 0 ) {
                                             String s = arrayNumber.remove(0);
-                                            if (s.length() > MoreContactUtils
-                                                    .MAX_LENGTH_NUMBER_IN_SIM) {
-                                                s = s.substring(0,
-                                                        MoreContactUtils.MAX_LENGTH_NUMBER_IN_SIM);
-                                            }
                                             anrNum.append(s);
                                             anrNum.append(SimContactsConstants.ANR_SEP);
                                         }
@@ -638,11 +633,6 @@ public class ImportExportDialogFragment extends DialogFragment
                                     for (int j = 0; j < emailCountInOneSimContact; j++) {
                                         if (arrayEmail.size() > 0) {
                                             String s = arrayEmail.remove(0);
-                                            if (s.length() > MoreContactUtils
-                                                    .MAX_LENGTH_EMAIL_IN_SIM) {
-                                                s = s.substring(0,
-                                                        MoreContactUtils.MAX_LENGTH_EMAIL_IN_SIM);
-                                            }
                                             email.append(s);
                                             email.append(SimContactsConstants.EMAIL_SEP);
                                         }
diff --git a/src/com/android/contacts/common/vcard/ImportVCardActivity.java b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
index 9da8c0b7..0bc0132b 100644..100755
--- a/src/com/android/contacts/common/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
@@ -110,6 +110,8 @@ public class ImportVCardActivity extends Activity {
 
     private Handler mHandler = new Handler();
 
+    private boolean mBind = false;
+
     // Runs on the UI thread.
     private class DialogDisplayer implements Runnable {
         private final int mResId;
@@ -153,14 +155,18 @@ public class ImportVCardActivity extends Activity {
         @Override
         public void onServiceConnected(ComponentName name, IBinder binder) {
             mService = ((VCardService.MyBinder) binder).getService();
-            Log.i(LOG_TAG,
-                    String.format("Connected to VCardService. Kick a vCard cache thread (uri: %s)",
-                            Arrays.toString(mVCardCacheThread.getSourceUris())));
-            mVCardCacheThread.start();
+            mBind = true;
+            if (mVCardCacheThread != null) {
+                Log.i(LOG_TAG, String.format(
+                                "Connected to VCardService. Kick a vCard cache thread (uri: %s)",
+                                Arrays.toString(mVCardCacheThread.getSourceUris())));
+                mVCardCacheThread.start();
+            }
         }
 
         @Override
         public void onServiceDisconnected(ComponentName name) {
+            mBind = false;
             Log.i(LOG_TAG, "Disconnected from VCardService");
         }
     }
@@ -284,9 +290,10 @@ public class ImportVCardActivity extends Activity {
             } finally {
                 Log.i(LOG_TAG, "Finished caching vCard.");
                 mWakeLock.release();
-                unbindService(mConnection);
-                mProgressDialogForCachingVCard.dismiss();
-                mProgressDialogForCachingVCard = null;
+                if (mProgressDialogForCachingVCard != null) {
+                    mProgressDialogForCachingVCard.dismiss();
+                    mProgressDialogForCachingVCard = null;
+                }
                 finish();
             }
         }
@@ -766,4 +773,13 @@ public class ImportVCardActivity extends Activity {
             }
         });
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mBind) {
+            unbindService(mConnection);
+            mBind = false;
+        }
+    }
 }