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

Merge change 23793 into eclair

Browse Source 
* changes:
  add conditional verbose logging for when sending a SMS message.
This commit is contained in:
Android (Google) Code Review
2009-09-03 01:33:44 -07:00
parent 85644d7889 8be9ccdc5c
commit 558340f214
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
telephony/java/com/android/internal/telephony/IccSmsInterfaceManager.java
View File

@@ -32,8 +32,6 @@ import static android.telephony.SmsManager.STATUS_ON_ICC_FREE;
* access Sms in Icc. * access Sms in Icc.
*/ */
public abstract class IccSmsInterfaceManager extends ISms.Stub { public abstract class IccSmsInterfaceManager extends ISms.Stub {
static final boolean DBG = true;
protected PhoneBase mPhone; protected PhoneBase mPhone;
protected Context mContext; protected Context mContext;
protected SMSDispatcher mDispatcher; protected SMSDispatcher mDispatcher;
@@ -80,9 +78,11 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
mPhone.getContext().enforceCallingPermission( mPhone.getContext().enforceCallingPermission(
"android.permission.SEND_SMS", "android.permission.SEND_SMS",
"Sending SMS message"); "Sending SMS message");
if (DBG) log("sendData: destAddr=" + destAddr + " scAddr=" + scAddr + " destPort=" + if (Log.isLoggable("SMS", Log.VERBOSE)) {
log("sendData: destAddr=" + destAddr + " scAddr=" + scAddr + " destPort=" +
destPort + " data='"+ HexDump.toHexString(data) + "' sentIntent=" + destPort + " data='"+ HexDump.toHexString(data) + "' sentIntent=" +
sentIntent + " deliveryIntent=" + deliveryIntent); sentIntent + " deliveryIntent=" + deliveryIntent);
}
mDispatcher.sendData(destAddr, scAddr, destPort, data, sentIntent, deliveryIntent); mDispatcher.sendData(destAddr, scAddr, destPort, data, sentIntent, deliveryIntent);
} }
@@ -115,9 +115,11 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
mPhone.getContext().enforceCallingPermission( mPhone.getContext().enforceCallingPermission(
"android.permission.SEND_SMS", "android.permission.SEND_SMS",
"Sending SMS message"); "Sending SMS message");
if (DBG) log("sendText: destAddr=" + destAddr + " scAddr=" + scAddr + if (Log.isLoggable("SMS", Log.VERBOSE)) {
log("sendText: destAddr=" + destAddr + " scAddr=" + scAddr +
" text='"+ text + "' sentIntent=" + " text='"+ text + "' sentIntent=" +
sentIntent + " deliveryIntent=" + deliveryIntent); sentIntent + " deliveryIntent=" + deliveryIntent);
}
mDispatcher.sendText(destAddr, scAddr, text, sentIntent, deliveryIntent); mDispatcher.sendText(destAddr, scAddr, text, sentIntent, deliveryIntent);
} }
@@ -151,7 +153,13 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
mPhone.getContext().enforceCallingPermission( mPhone.getContext().enforceCallingPermission(
"android.permission.SEND_SMS", "android.permission.SEND_SMS",
"Sending SMS message"); "Sending SMS message");
if (DBG) log("sendMultipartText"); if (Log.isLoggable("SMS", Log.VERBOSE)) {
int i = 0;
for (String part : parts) {
log("sendMultipartText: destAddr=" + destAddr + ", srAddr=" + scAddr +
", part[" + (i++) + "]=" + part);
}
}
mDispatcher.sendMultipartText(destAddr, scAddr, (ArrayList<String>) parts, mDispatcher.sendMultipartText(destAddr, scAddr, (ArrayList<String>) parts,
(ArrayList<PendingIntent>) sentIntents, (ArrayList<PendingIntent>) deliveryIntents); (ArrayList<PendingIntent>) sentIntents, (ArrayList<PendingIntent>) deliveryIntents);
} }