am 6d1271ae: Fix crash in large tests (#2108431)

Merge commit '6d1271aee78f195e094aca650d8dceee79fbb5e4' into eclair-plus-aosp

* commit '6d1271aee78f195e094aca650d8dceee79fbb5e4':
  Fix crash in large tests (#2108431)
This commit is contained in:
Marc Blank 2009-09-09 13:57:31 -07:00 committed by Android Git Automerger
commit f752adfa40

View File

@ -672,12 +672,14 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
String action = getIntent().getAction(); String action = getIntent().getAction();
// Use the Intent to set flags saying this message is a reply or a forward and save the // Use the Intent to set flags saying this message is a reply or a forward and save the
// unique id of the source message // unique id of the source message
if (ACTION_REPLY.equals(action) || ACTION_REPLY_ALL.equals(action)) { if (mSource != null) {
message.mFlags |= Message.FLAG_TYPE_REPLY; if (ACTION_REPLY.equals(action) || ACTION_REPLY_ALL.equals(action)) {
message.mSourceKey = mSource.mId; message.mFlags |= Message.FLAG_TYPE_REPLY;
} else if (ACTION_FORWARD.equals(action)) { message.mSourceKey = mSource.mId;
message.mFlags |= Message.FLAG_TYPE_FORWARD; } else if (ACTION_FORWARD.equals(action)) {
message.mSourceKey = mSource.mId; message.mFlags |= Message.FLAG_TYPE_FORWARD;
message.mSourceKey = mSource.mId;
}
} }
} }