Fix ServiceConnectionLeaked during import vcard

- Service registered when activity create but not unregister
  when activity destroy, it will cause ServiceConnectionLeaked
  after rotate screen.

CRs-Fixed: 1080625

Change-Id: Ia0fe990bc96fee8b448caf697a5c5aaa275a7b13

1 files changed, 17 insertions, 3 deletions

diff --git a/src/com/android/contacts/common/vcard/ImportVCardActivity.java b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
index 9da8c0b7..eaacb600 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,6 +155,7 @@ public class ImportVCardActivity extends Activity {
         @Override
         public void onServiceConnected(ComponentName name, IBinder binder) {
             mService = ((VCardService.MyBinder) binder).getService();
+            mBind = true;
             Log.i(LOG_TAG,
                     String.format("Connected to VCardService. Kick a vCard cache thread (uri: %s)",
                             Arrays.toString(mVCardCacheThread.getSourceUris())));
@@ -161,6 +164,7 @@ public class ImportVCardActivity extends Activity {
 
         @Override
         public void onServiceDisconnected(ComponentName name) {
+            mBind = false;
             Log.i(LOG_TAG, "Disconnected from VCardService");
         }
     }
@@ -284,9 +288,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 +771,13 @@ public class ImportVCardActivity extends Activity {
             }
         });
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mBind) {
+            unbindService(mConnection);
+            mBind = false;
+        }
+    }
 }