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

Merge change 25109 into eclair

Browse Source 
* changes:
  Some SMS logging improvements.
This commit is contained in:
Android (Google) Code Review
2009-09-15 16:37:36 -04:00
parent 91a5d831d6 50f7ea53c3
commit d631fedb6c
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/com/android/internal/telephony/SmsResponse.java
View File

@@ -37,4 +37,12 @@ public class SmsResponse {
this.ackPdu = ackPdu; this.ackPdu = ackPdu;
this.errorCode = errorCode; this.errorCode = errorCode;
} }
public String toString() {
String ret = "{ messageRef = " + messageRef
+ ", errorCode = " + errorCode
+ ", ackPdu = " + ackPdu
+ "}";
return ret;
}
} }

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

@@ -69,7 +69,7 @@ import static android.telephony.SmsMessage.MessageClass;
*/ */
public class SmsMessage extends SmsMessageBase { public class SmsMessage extends SmsMessageBase {
static final String LOG_TAG = "CDMA"; static final String LOG_TAG = "CDMA";
private final static Boolean DBG_SMS = false; static private final String LOGGABLE_TAG = "CDMA:SMS";
/** /**
* Status of a previously submitted SMS. * Status of a previously submitted SMS.
@@ -533,7 +533,7 @@ public class SmsMessage extends SmsMessageBase {
return; return;
} }
mBearerData = BearerData.decode(mEnvelope.bearerData); mBearerData = BearerData.decode(mEnvelope.bearerData);
if (DBG_SMS) { if (Log.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) {
Log.d(LOG_TAG, "MT raw BearerData = '" + Log.d(LOG_TAG, "MT raw BearerData = '" +
HexDump.toHexString(mEnvelope.bearerData) + "'"); HexDump.toHexString(mEnvelope.bearerData) + "'");
Log.d(LOG_TAG, "MT (decoded) BearerData = " + mBearerData); Log.d(LOG_TAG, "MT (decoded) BearerData = " + mBearerData);
@@ -614,7 +614,7 @@ public class SmsMessage extends SmsMessageBase {
int msgId = SystemProperties.getInt(TelephonyProperties.PROPERTY_CDMA_MSG_ID, 1); int msgId = SystemProperties.getInt(TelephonyProperties.PROPERTY_CDMA_MSG_ID, 1);
String nextMsgId = Integer.toString((msgId % 0xFFFF) + 1); String nextMsgId = Integer.toString((msgId % 0xFFFF) + 1);
SystemProperties.set(TelephonyProperties.PROPERTY_CDMA_MSG_ID, nextMsgId); SystemProperties.set(TelephonyProperties.PROPERTY_CDMA_MSG_ID, nextMsgId);
if (DBG_SMS) { if (Log.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) {
Log.d(LOG_TAG, "next " + TelephonyProperties.PROPERTY_CDMA_MSG_ID + " = " + nextMsgId); Log.d(LOG_TAG, "next " + TelephonyProperties.PROPERTY_CDMA_MSG_ID + " = " + nextMsgId);
Log.d(LOG_TAG, "readback gets " + Log.d(LOG_TAG, "readback gets " +
SystemProperties.get(TelephonyProperties.PROPERTY_CDMA_MSG_ID)); SystemProperties.get(TelephonyProperties.PROPERTY_CDMA_MSG_ID));
@@ -655,7 +655,7 @@ public class SmsMessage extends SmsMessageBase {
bearerData.userData = userData; bearerData.userData = userData;
byte[] encodedBearerData = BearerData.encode(bearerData); byte[] encodedBearerData = BearerData.encode(bearerData);
if (DBG_SMS) { if (Log.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) {
Log.d(LOG_TAG, "MO (encoded) BearerData = " + bearerData); Log.d(LOG_TAG, "MO (encoded) BearerData = " + bearerData);
Log.d(LOG_TAG, "MO raw BearerData = '" + HexDump.toHexString(encodedBearerData) + "'"); Log.d(LOG_TAG, "MO raw BearerData = '" + HexDump.toHexString(encodedBearerData) + "'");
} }