| Chunk |
|---|
| Conflicting content |
|---|
sms = (SmsMessage) ar.result;
try {
<<<<<<< HEAD:telephony/java/com/android/internal/telephony/SMSDispatcher.java
if (mStorageAvailable) {
int result = dispatchMessage(sms.mWrappedSmsMessage);
if (result != Activity.RESULT_OK) {
// RESULT_OK means that message was broadcast for app(s) to handle.
// Any other result, we should ack here.
boolean handled = (result == Intents.RESULT_SMS_HANDLED);
acknowledgeLastIncomingSms(handled, result, null);
}
} else {
acknowledgeLastIncomingSms(false, Intents.RESULT_SMS_OUT_OF_MEMORY, null);
}
} catch (RuntimeException ex) {
acknowledgeLastIncomingSms(false, Intents.RESULT_SMS_GENERIC_ERROR, null);
=======
dispatchMessage(sms);
} catch (RuntimeException ex) {
Log.e(TAG, "Exception processing incoming SMS. Exception:" + ex);
>>>>>>> 2e7e15f2da527f762f6eb56b974e758d83f12660:telephony/java/com/android/internal/telephony/gsm/SMSDispatcher.java
}
break; |
| Solution content |
|---|
sms = (SmsMessage) ar.result;
try {
if (mStorageAvailable) {
int result = dispatchMessage(sms.mWrappedSmsMessage);
if (result != Activity.RESULT_OK) {
// RESULT_OK means that message was broadcast for app(s) to handle.
// Any other result, we should ack here.
boolean handled = (result == Intents.RESULT_SMS_HANDLED);
acknowledgeLastIncomingSms(handled, result, null);
}
} else {
acknowledgeLastIncomingSms(false, Intents.RESULT_SMS_OUT_OF_MEMORY, null);
}
} catch (RuntimeException ex) {
acknowledgeLastIncomingSms(false, Intents.RESULT_SMS_GENERIC_ERROR, null);
}
break; |
| File |
|---|
| SMSDispatcher.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Catch clause |
| If statement |
| Method invocation |