Merge commit '6d1271aee78f195e094aca650d8dceee79fbb5e4' into eclair-plus-aosp * commit '6d1271aee78f195e094aca650d8dceee79fbb5e4': Fix crash in large tests (#2108431)
This commit is contained in:
commit
f752adfa40
@ -672,12 +672,14 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
|
||||
String action = getIntent().getAction();
|
||||
// Use the Intent to set flags saying this message is a reply or a forward and save the
|
||||
// unique id of the source message
|
||||
if (ACTION_REPLY.equals(action) || ACTION_REPLY_ALL.equals(action)) {
|
||||
message.mFlags |= Message.FLAG_TYPE_REPLY;
|
||||
message.mSourceKey = mSource.mId;
|
||||
} else if (ACTION_FORWARD.equals(action)) {
|
||||
message.mFlags |= Message.FLAG_TYPE_FORWARD;
|
||||
message.mSourceKey = mSource.mId;
|
||||
if (mSource != null) {
|
||||
if (ACTION_REPLY.equals(action) || ACTION_REPLY_ALL.equals(action)) {
|
||||
message.mFlags |= Message.FLAG_TYPE_REPLY;
|
||||
message.mSourceKey = mSource.mId;
|
||||
} else if (ACTION_FORWARD.equals(action)) {
|
||||
message.mFlags |= Message.FLAG_TYPE_FORWARD;
|
||||
message.mSourceKey = mSource.mId;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user