Snap for 7310088 from 7e8ab0ca503dfda013e92eb1bd43fcd9825ee9bf to sc-release
Change-Id: Iba478e0b2d3569c78296c9ec2b1d3b7f73b005ef
diff --git a/src/com/android/mms/service/MmsService.java b/src/com/android/mms/service/MmsService.java
index 639839a..2403e12 100644
--- a/src/com/android/mms/service/MmsService.java
+++ b/src/com/android/mms/service/MmsService.java
@@ -490,6 +490,7 @@
* Calls the pending intent with <code>MMS_ERROR_NO_DATA_NETWORK</code>.
*/
private void sendErrorInPendingIntent(@Nullable PendingIntent intent) {
+ LogUtil.d("sendErrorInPendingIntent - no data network");
if (intent != null) {
try {
intent.send(SmsManager.MMS_ERROR_NO_DATA_NETWORK);
@@ -538,6 +539,9 @@
movePendingSimRequestsToRunningSynchronized();
}
} else {
+ LogUtil.d("Add request to running queue."
+ + " Request subId=" + request.getSubId() + ","
+ + " current subId=" + mCurrentSubId);
addToRunningRequestQueueSynchronized(request);
}
}
@@ -578,6 +582,8 @@
} finally {
synchronized (MmsService.this) {
mRunningRequestCount--;
+ LogUtil.d("addToRunningRequestQueueSynchronized mRunningRequestCount="
+ + mRunningRequestCount);
if (mRunningRequestCount <= 0) {
movePendingSimRequestsToRunningSynchronized();
}
@@ -588,7 +594,8 @@
}
private void movePendingSimRequestsToRunningSynchronized() {
- LogUtil.d("Schedule requests pending on SIM");
+ LogUtil.d("Move pending requests to running queue mPendingSimRequestQueue.size="
+ + mPendingSimRequestQueue.size());
mCurrentSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
while (mPendingSimRequestQueue.size() > 0) {
final MmsRequest request = mPendingSimRequestQueue.peek();
@@ -597,9 +604,15 @@
|| mCurrentSubId == request.getSubId()) {
// First or subsequent requests with same SIM ID
mPendingSimRequestQueue.remove();
+ LogUtil.d("Move pending request to running queue."
+ + " Request subId=" + request.getSubId() + ","
+ + " current subId=" + mCurrentSubId);
addToRunningRequestQueueSynchronized(request);
} else {
// Stop if we see a different SIM ID
+ LogUtil.d("Pending request not moved to running queue, different subId."
+ + " Request subId=" + request.getSubId() + ","
+ + " current subId=" + mCurrentSubId);
break;
}
} else {
diff --git a/src/com/android/mms/service/SendRequest.java b/src/com/android/mms/service/SendRequest.java
index 43cc46b..67c368d 100644
--- a/src/com/android/mms/service/SendRequest.java
+++ b/src/com/android/mms/service/SendRequest.java
@@ -96,7 +96,7 @@
final String requestId = getRequestId();
try {
if (mPduData == null) {
- LogUtil.w(requestId, "Empty PDU raw data. "
+ LogUtil.d(requestId, "Empty PDU raw data. "
+ MmsService.formatCrossStackMessageId(mMessageId));
return null;
}
@@ -104,8 +104,8 @@
mMmsConfig.getBoolean(SmsManager.MMS_CONFIG_SUPPORT_MMS_CONTENT_DISPOSITION);
return new PduParser(mPduData, supportContentDisposition).parse();
} catch (final Exception e) {
- LogUtil.w(requestId, "Failed to parse PDU raw data. "
- + MmsService.formatCrossStackMessageId(mMessageId));
+ LogUtil.e(requestId, "Failed to parse PDU raw data. "
+ + MmsService.formatCrossStackMessageId(mMessageId), e);
}
return null;
}