Merge "Fix NPE when not connected to vcard service" into ub-contactsdialer-b-dev (1f8d335d) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/common/vcard/ExportVCardActivity.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -103,7 +103,8 @@ public class ExportVCardActivity extends Activity implements ServiceConnection,
		@Override
		public void onActivityResult(int requestCode, int resultCode, Intent data) {
		if (requestCode == REQUEST_CREATE_DOCUMENT) {
		if (resultCode == Activity.RESULT_OK && data != null && data.getData() != null) {
		if (resultCode == Activity.RESULT_OK && mService != null &&
		data != null && data.getData() != null) {
		final Uri mTargetFileName = data.getData();
		if (DEBUG) Log.d(LOG_TAG, "exporting to " + mTargetFileName);
		final ExportRequest request = new ExportRequest(mTargetFileName);
		@@ -111,8 +112,12 @@ public class ExportVCardActivity extends Activity implements ServiceConnection,
		mService.handleExportRequest(request, new NotificationImportExportListener(
		ExportVCardActivity.this));
		} else if (DEBUG) {
		if (mService == null) {
		Log.d(LOG_TAG, "No vCard service.");
		} else {
		Log.d(LOG_TAG, "create document cancelled or no data returned");
		}
		}
		unbindAndFinish();
		}
		}