Merge change 26340 into eclair
* changes:
Update action chicklets in correct order.
diff --git a/src/com/android/contacts/ImportVCardActivity.java b/src/com/android/contacts/ImportVCardActivity.java
index 4b59e16..027c70e 100644
--- a/src/com/android/contacts/ImportVCardActivity.java
+++ b/src/com/android/contacts/ImportVCardActivity.java
@@ -264,7 +264,7 @@
mWakeLock.release();
mProgressDialogForReadVCard.dismiss();
// finish() is called via ErrorDisplayer() on failure.
- if (shouldCallFinish) {
+ if (shouldCallFinish && !isFinishing()) {
if (mErrorFileNameList == null || mErrorFileNameList.isEmpty()) {
finish();
} else {
@@ -796,7 +796,9 @@
// ImportVCardActivity should not be persistent. In other words, if there's some
// event calling onStop(), this Activity should finish its work and give the main
// screen back to the caller Activity.
- finish();
+ if (!isFinishing()) {
+ finish();
+ }
}
@Override