Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 22127 into eclair

Browse Source 
* changes:
  more cdma sms debug logging
This commit is contained in:
Android (Google) Code Review
2009-08-20 14:43:17 -07:00
parent 58b6d1be26 49bd918dc2
commit bb7362c3b0
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
View File

@@ -29,6 +29,7 @@ import com.android.internal.telephony.cdma.sms.BearerData;
import com.android.internal.telephony.cdma.sms.CdmaSmsAddress; import com.android.internal.telephony.cdma.sms.CdmaSmsAddress;
import com.android.internal.telephony.cdma.sms.SmsEnvelope; import com.android.internal.telephony.cdma.sms.SmsEnvelope;
import com.android.internal.telephony.cdma.sms.UserData; import com.android.internal.telephony.cdma.sms.UserData;
import com.android.internal.util.HexDump;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
@@ -542,7 +543,11 @@ public class SmsMessage extends SmsMessageBase {
return; return;
} }
mBearerData = BearerData.decode(mEnvelope.bearerData); mBearerData = BearerData.decode(mEnvelope.bearerData);
if (DBG_SMS) Log.d(LOG_TAG, "MT (decoded) BearerData = " + mBearerData); if (DBG_SMS) {
Log.d(LOG_TAG, "MT raw BearerData = '" +
HexDump.toHexString(mEnvelope.bearerData) + "'");
Log.d(LOG_TAG, "MT (decoded) BearerData = " + mBearerData);
}
messageRef = mBearerData.messageId; messageRef = mBearerData.messageId;
if (mBearerData.userData != null) { if (mBearerData.userData != null) {
userData = mBearerData.userData.payload; userData = mBearerData.userData.payload;
@@ -648,7 +653,10 @@ public class SmsMessage extends SmsMessageBase {
bearerData.userData = userData; bearerData.userData = userData;
byte[] encodedBearerData = BearerData.encode(bearerData); byte[] encodedBearerData = BearerData.encode(bearerData);
if (DBG_SMS) Log.d(LOG_TAG, "MO (encoded) BearerData = " + bearerData); if (DBG_SMS) {
Log.d(LOG_TAG, "MO (encoded) BearerData = " + bearerData);
Log.d(LOG_TAG, "MO raw BearerData = '" + HexDump.toHexString(encodedBearerData) + "'");
}
if (encodedBearerData == null) return null; if (encodedBearerData == null) return null;
int teleservice = bearerData.hasUserDataHeader ? int teleservice = bearerData.hasUserDataHeader ?