diff options
Diffstat (limited to 'telephony')
12 files changed, 44 insertions, 56 deletions
diff --git a/telephony/java/com/android/internal/telephony/BaseCommands.java b/telephony/java/com/android/internal/telephony/BaseCommands.java index 076db8b..ec04fa8 100644 --- a/telephony/java/com/android/internal/telephony/BaseCommands.java +++ b/telephony/java/com/android/internal/telephony/BaseCommands.java @@ -22,7 +22,6 @@ import android.os.RegistrantList; import android.os.Registrant; import android.os.Handler; import android.os.AsyncResult; -import android.util.Config; import android.util.Log; /** @@ -676,7 +675,7 @@ public abstract class BaseCommands implements CommandsInterface { RadioState oldState; synchronized (mStateMonitor) { - if (Config.LOGV) { + if (false) { Log.v(LOG_TAG, "setRadioState old: " + mState + " new " + newState); } diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java index 2633ca6..863daef 100644 --- a/telephony/java/com/android/internal/telephony/RIL.java +++ b/telephony/java/com/android/internal/telephony/RIL.java @@ -45,7 +45,6 @@ import android.telephony.PhoneNumberUtils; import android.telephony.SmsManager; import android.telephony.SmsMessage; import android.text.TextUtils; -import android.util.Config; import android.util.Log; import com.android.internal.telephony.CallForwardInfo; @@ -1271,7 +1270,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { rr.mp.writeInt(1); rr.mp.writeInt(index); - if (Config.LOGD) { + if (false) { if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) + " " + index); @@ -1287,7 +1286,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { rr.mp.writeInt(1); rr.mp.writeInt(index); - if (Config.LOGD) { + if (false) { if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) + " " + index); @@ -1306,7 +1305,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { rr.mp.writeString(pdu); rr.mp.writeString(smsc); - if (Config.LOGD) { + if (false) { if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) + " " + status); @@ -1324,7 +1323,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { rr.mp.writeInt(status); rr.mp.writeString(pdu); - if (Config.LOGD) { + if (false) { if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) + " " + status); diff --git a/telephony/java/com/android/internal/telephony/SMSDispatcher.java b/telephony/java/com/android/internal/telephony/SMSDispatcher.java index 6af9b1c..8efc9aa 100755 --- a/telephony/java/com/android/internal/telephony/SMSDispatcher.java +++ b/telephony/java/com/android/internal/telephony/SMSDispatcher.java @@ -43,7 +43,6 @@ import android.provider.Telephony.Sms.Intents; import android.provider.Settings; import android.telephony.SmsMessage; import android.telephony.ServiceState; -import android.util.Config; import android.util.Log; import android.view.WindowManager; @@ -303,7 +302,7 @@ public abstract class SMSDispatcher extends Handler { switch (msg.what) { case EVENT_NEW_SMS: // A new SMS has been received by the device - if (Config.LOGD) { + if (false) { Log.d(TAG, "New SMS Message Received"); } @@ -364,7 +363,7 @@ public abstract class SMSDispatcher extends Handler { Log.e(TAG, "failed to send back RESULT_ERROR_LIMIT_EXCEEDED"); } } - if (Config.LOGD) { + if (false) { Log.d(TAG, "EVENT_ALERT_TIMEOUT, message stop sending"); } break; @@ -476,7 +475,7 @@ public abstract class SMSDispatcher extends Handler { PendingIntent sentIntent = tracker.mSentIntent; if (ar.exception == null) { - if (Config.LOGD) { + if (false) { Log.d(TAG, "SMS send complete. Broadcasting " + "intent: " + sentIntent); } @@ -504,7 +503,7 @@ public abstract class SMSDispatcher extends Handler { } catch (CanceledException ex) {} } } else { - if (Config.LOGD) { + if (false) { Log.d(TAG, "SMS send failed"); } @@ -1070,7 +1069,7 @@ public abstract class SMSDispatcher extends Handler { Intent intent = new Intent("android.provider.telephony.SMS_CB_RECEIVED"); intent.putExtra("pdus", pdus); - if (Config.LOGD) + if (false) Log.d(TAG, "Dispatching " + pdus.length + " SMS CB pdus"); dispatch(intent, "android.permission.RECEIVE_SMS"); diff --git a/telephony/java/com/android/internal/telephony/WapPushOverSms.java b/telephony/java/com/android/internal/telephony/WapPushOverSms.java index 7704667..e2779dc 100644 --- a/telephony/java/com/android/internal/telephony/WapPushOverSms.java +++ b/telephony/java/com/android/internal/telephony/WapPushOverSms.java @@ -24,7 +24,6 @@ import android.content.Intent; import android.content.ServiceConnection; import android.provider.Telephony; import android.provider.Telephony.Sms.Intents; -import android.util.Config; import android.util.Log; import android.os.IBinder; import android.os.RemoteException; @@ -62,13 +61,13 @@ public class WapPushOverSms { public void onServiceConnected(ComponentName name, IBinder service) { mWapPushMan = IWapPushManager.Stub.asInterface(service); - if (Config.DEBUG) Log.v(LOG_TAG, "wappush manager connected to " + + if (false) Log.v(LOG_TAG, "wappush manager connected to " + mOwner.hashCode()); } public void onServiceDisconnected(ComponentName name) { mWapPushMan = null; - if (Config.DEBUG) Log.v(LOG_TAG, "wappush manager disconnected."); + if (false) Log.v(LOG_TAG, "wappush manager disconnected."); // WapPushManager must be always attached. rebindWapPushManager(); } @@ -101,7 +100,7 @@ public class WapPushOverSms { try { Thread.sleep(BIND_RETRY_INTERVAL); } catch (InterruptedException e) { - if (Config.DEBUG) Log.v(LOG_TAG, "sleep interrupted."); + if (false) Log.v(LOG_TAG, "sleep interrupted."); } } } @@ -135,7 +134,7 @@ public class WapPushOverSms { */ public int dispatchWapPdu(byte[] pdu) { - if (Config.DEBUG) Log.d(LOG_TAG, "Rx: " + IccUtils.bytesToHexString(pdu)); + if (false) Log.d(LOG_TAG, "Rx: " + IccUtils.bytesToHexString(pdu)); int index = 0; int transactionId = pdu[index++] & 0xFF; @@ -144,7 +143,7 @@ public class WapPushOverSms { if ((pduType != WspTypeDecoder.PDU_TYPE_PUSH) && (pduType != WspTypeDecoder.PDU_TYPE_CONFIRMED_PUSH)) { - if (Config.DEBUG) Log.w(LOG_TAG, "Received non-PUSH WAP PDU. Type = " + pduType); + if (false) Log.w(LOG_TAG, "Received non-PUSH WAP PDU. Type = " + pduType); return Intents.RESULT_SMS_HANDLED; } @@ -157,7 +156,7 @@ public class WapPushOverSms { * So it will be encoded in no more than 5 octets. */ if (pduDecoder.decodeUintvarInteger(index) == false) { - if (Config.DEBUG) Log.w(LOG_TAG, "Received PDU. Header Length error."); + if (false) Log.w(LOG_TAG, "Received PDU. Header Length error."); return Intents.RESULT_SMS_GENERIC_ERROR; } headerLength = (int)pduDecoder.getValue32(); @@ -178,7 +177,7 @@ public class WapPushOverSms { * Length = Uintvar-integer */ if (pduDecoder.decodeContentType(index) == false) { - if (Config.DEBUG) Log.w(LOG_TAG, "Received PDU. Header Content-Type error."); + if (false) Log.w(LOG_TAG, "Received PDU. Header Content-Type error."); return Intents.RESULT_SMS_GENERIC_ERROR; } @@ -215,14 +214,14 @@ public class WapPushOverSms { String contentType = ((mimeType == null) ? Long.toString(binaryContentType) : mimeType); - if (Config.DEBUG) Log.v(LOG_TAG, "appid found: " + wapAppId + ":" + contentType); + if (false) Log.v(LOG_TAG, "appid found: " + wapAppId + ":" + contentType); try { boolean processFurther = true; IWapPushManager wapPushMan = mWapConn.getWapPushManager(); if (wapPushMan == null) { - if (Config.DEBUG) Log.w(LOG_TAG, "wap push manager not found!"); + if (false) Log.w(LOG_TAG, "wap push manager not found!"); } else { Intent intent = new Intent(); intent.putExtra("transactionId", transactionId); @@ -233,7 +232,7 @@ public class WapPushOverSms { pduDecoder.getContentParameters()); int procRet = wapPushMan.processMessage(wapAppId, contentType, intent); - if (Config.DEBUG) Log.v(LOG_TAG, "procRet:" + procRet); + if (false) Log.v(LOG_TAG, "procRet:" + procRet); if ((procRet & WapPushManagerParams.MESSAGE_HANDLED) > 0 && (procRet & WapPushManagerParams.FURTHER_PROCESSING) == 0) { processFurther = false; @@ -243,13 +242,13 @@ public class WapPushOverSms { return Intents.RESULT_SMS_HANDLED; } } catch (RemoteException e) { - if (Config.DEBUG) Log.w(LOG_TAG, "remote func failed..."); + if (false) Log.w(LOG_TAG, "remote func failed..."); } } - if (Config.DEBUG) Log.v(LOG_TAG, "fall back to existing handler"); + if (false) Log.v(LOG_TAG, "fall back to existing handler"); if (mimeType == null) { - if (Config.DEBUG) Log.w(LOG_TAG, "Header Content-Type error."); + if (false) Log.w(LOG_TAG, "Header Content-Type error."); return Intents.RESULT_SMS_GENERIC_ERROR; } diff --git a/telephony/java/com/android/internal/telephony/cat/CatService.java b/telephony/java/com/android/internal/telephony/cat/CatService.java index a6c7777..5217ecd 100644 --- a/telephony/java/com/android/internal/telephony/cat/CatService.java +++ b/telephony/java/com/android/internal/telephony/cat/CatService.java @@ -30,7 +30,6 @@ import com.android.internal.telephony.IccCard; import com.android.internal.telephony.IccFileHandler; import com.android.internal.telephony.IccRecords; -import android.util.Config; import java.io.ByteArrayOutputStream; @@ -366,7 +365,7 @@ public class CatService extends Handler implements AppInterface { byte[] rawData = buf.toByteArray(); String hexString = IccUtils.bytesToHexString(rawData); - if (Config.LOGD) { + if (false) { CatLog.d(this, "TERMINAL RESPONSE: " + hexString); } diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaConnection.java b/telephony/java/com/android/internal/telephony/cdma/CdmaConnection.java index 1a15393..8fb136e 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaConnection.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaConnection.java @@ -26,7 +26,6 @@ import android.os.PowerManager; import android.os.Registrant; import android.os.SystemClock; import android.os.SystemProperties; -import android.util.Config; import android.util.Log; import android.text.TextUtils; @@ -453,7 +452,7 @@ public class CdmaConnection extends Connection { if (!disconnected) { doDisconnect(); - if (Config.LOGD) Log.d(LOG_TAG, + if (false) Log.d(LOG_TAG, "[CDMAConn] onDisconnect: cause=" + cause); owner.phone.notifyDisconnect(this); @@ -470,7 +469,7 @@ public class CdmaConnection extends Connection { onLocalDisconnect() { if (!disconnected) { doDisconnect(); - if (Config.LOGD) Log.d(LOG_TAG, + if (false) Log.d(LOG_TAG, "[CDMAConn] onLoalDisconnect" ); if (parent != null) { diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java b/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java index c0bfd23..cf6b78a 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java @@ -33,7 +33,6 @@ import android.provider.Telephony; import android.provider.Telephony.Sms.Intents; import android.telephony.SmsManager; import android.telephony.SmsMessage.MessageClass; -import android.util.Config; import android.util.Log; import com.android.internal.telephony.CommandsInterface; @@ -145,7 +144,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher { handleCdmaStatusReport(sms); handled = true; } else if ((sms.getUserData() == null)) { - if (Config.LOGD) { + if (false) { Log.d(TAG, "Received SMS without user data"); } handled = true; @@ -435,7 +434,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher { sentIntent.send(SmsManager.RESULT_ERROR_NO_SERVICE); } catch (CanceledException ex) {} } - if (Config.LOGD) { + if (false) { Log.d(TAG, "Block SMS in Emergency Callback mode"); } return; diff --git a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java index 4911644..3f4cd67 100644 --- a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java @@ -18,7 +18,6 @@ package com.android.internal.telephony.cdma; import android.os.Parcel; import android.os.SystemProperties; -import android.util.Config; import android.util.Log; import com.android.internal.telephony.IccUtils; import com.android.internal.telephony.SmsHeader; @@ -694,7 +693,7 @@ public class SmsMessage extends SmsMessageBase { if (mEnvelope.bearerData != null) { mBearerData.numberOfMessages = 0x000000FF & mEnvelope.bearerData[0]; } - if (Config.DEBUG) { + if (false) { Log.d(LOG_TAG, "parseSms: get MWI " + Integer.toString(mBearerData.numberOfMessages)); } @@ -715,7 +714,7 @@ public class SmsMessage extends SmsMessageBase { if (originatingAddress != null) { originatingAddress.address = new String(originatingAddress.origBytes); - if (Config.LOGV) Log.v(LOG_TAG, "SMS originating address: " + if (false) Log.v(LOG_TAG, "SMS originating address: " + originatingAddress.address); } @@ -723,7 +722,7 @@ public class SmsMessage extends SmsMessageBase { scTimeMillis = mBearerData.msgCenterTimeStamp.toMillis(true); } - if (Config.LOGD) Log.d(LOG_TAG, "SMS SC timestamp: " + scTimeMillis); + if (false) Log.d(LOG_TAG, "SMS SC timestamp: " + scTimeMillis); // Message Type (See 3GPP2 C.S0015-B, v2, 4.5.1) if (mBearerData.messageType == BearerData.MESSAGE_TYPE_DELIVERY_ACK) { @@ -748,9 +747,9 @@ public class SmsMessage extends SmsMessageBase { } if (messageBody != null) { - if (Config.LOGV) Log.v(LOG_TAG, "SMS message body: '" + messageBody + "'"); + if (false) Log.v(LOG_TAG, "SMS message body: '" + messageBody + "'"); parseMessageBody(); - } else if ((userData != null) && (Config.LOGV)) { + } else if ((userData != null) && (false)) { Log.v(LOG_TAG, "SMS payload: '" + IccUtils.bytesToHexString(userData) + "'"); } } diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmConnection.java b/telephony/java/com/android/internal/telephony/gsm/GsmConnection.java index 0870d5b..c1ad7b3 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmConnection.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmConnection.java @@ -23,7 +23,6 @@ import android.os.Message; import android.os.PowerManager; import android.os.Registrant; import android.os.SystemClock; -import android.util.Config; import android.util.Log; import android.telephony.PhoneNumberUtils; import android.telephony.ServiceState; @@ -410,7 +409,7 @@ public class GsmConnection extends Connection { duration = SystemClock.elapsedRealtime() - connectTimeReal; disconnected = true; - if (Config.LOGD) Log.d(LOG_TAG, + if (false) Log.d(LOG_TAG, "[GSMConn] onDisconnect: cause=" + cause); owner.phone.notifyDisconnect(this); diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java b/telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java index 21a12f1..43d6b23 100755 --- a/telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java @@ -28,7 +28,6 @@ import android.provider.Telephony.Sms.Intents; import android.telephony.ServiceState; import android.telephony.SmsCbMessage; import android.telephony.gsm.GsmCellLocation; -import android.util.Config; import android.util.Log; import com.android.internal.telephony.BaseCommands; @@ -126,13 +125,13 @@ final class GsmSMSDispatcher extends SMSDispatcher { if (sms.isMWISetMessage()) { mGsmPhone.updateMessageWaitingIndicator(true); handled = sms.isMwiDontStore(); - if (Config.LOGD) { + if (false) { Log.d(TAG, "Received voice mail indicator set SMS shouldStore=" + !handled); } } else if (sms.isMWIClearMessage()) { mGsmPhone.updateMessageWaitingIndicator(false); handled = sms.isMwiDontStore(); - if (Config.LOGD) { + if (false) { Log.d(TAG, "Received voice mail indicator clear SMS shouldStore=" + !handled); } } @@ -504,7 +503,7 @@ final class GsmSMSDispatcher extends SMSDispatcher { byte[][] pdus = null; byte[] receivedPdu = (byte[])ar.result; - if (Config.LOGD) { + if (false) { for (int i = 0; i < receivedPdu.length; i += 8) { StringBuilder sb = new StringBuilder("SMS CB pdu data: "); for (int j = i; j < i + 8 && j < receivedPdu.length; j++) { diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index 72cc666..29a1ed5 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -55,7 +55,6 @@ import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.gsm.GsmCellLocation; import android.text.TextUtils; -import android.util.Config; import android.util.EventLog; import android.util.Log; import android.util.TimeUtils; @@ -1476,7 +1475,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { } SystemProperties.set("gsm.nitz.time", String.valueOf(c.getTimeInMillis())); saveNitzTime(c.getTimeInMillis()); - if (DBG) { + if (false) { long end = SystemClock.elapsedRealtime(); log("NITZ: end=" + end + " dur=" + (end - start)); } diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java index e24613f..e960091 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java @@ -19,7 +19,6 @@ package com.android.internal.telephony.gsm; import android.os.Parcel; import android.telephony.PhoneNumberUtils; import android.text.format.Time; -import android.util.Config; import android.util.Log; import com.android.internal.telephony.IccUtils; import com.android.internal.telephony.EncodeException; @@ -458,7 +457,7 @@ public class SmsMessage extends SmsMessageBase { if (statusReportRequested) { // Set TP-Status-Report-Request bit. mtiByte |= 0x20; - if (Config.LOGD) Log.d(LOG_TAG, "SMS status report requested"); + if (false) Log.d(LOG_TAG, "SMS status report requested"); } bo.write(mtiByte); @@ -942,7 +941,7 @@ public class SmsMessage extends SmsMessageBase { scAddress = p.getSCAddress(); if (scAddress != null) { - if (Config.LOGD) Log.d(LOG_TAG, "SMS SC address: " + scAddress); + if (false) Log.d(LOG_TAG, "SMS SC address: " + scAddress); } // TODO(mkf) support reply path, user data header indicator @@ -1024,7 +1023,7 @@ public class SmsMessage extends SmsMessageBase { originatingAddress = p.getAddress(); if (originatingAddress != null) { - if (Config.LOGV) Log.v(LOG_TAG, "SMS originating address: " + if (false) Log.v(LOG_TAG, "SMS originating address: " + originatingAddress.address); } @@ -1036,14 +1035,14 @@ public class SmsMessage extends SmsMessageBase { // see TS 23.038 dataCodingScheme = p.getByte(); - if (Config.LOGV) { + if (false) { Log.v(LOG_TAG, "SMS TP-PID:" + protocolIdentifier + " data coding scheme: " + dataCodingScheme); } scTimeMillis = p.getSCTimestampMillis(); - if (Config.LOGD) Log.d(LOG_TAG, "SMS SC timestamp: " + scTimeMillis); + if (false) Log.d(LOG_TAG, "SMS SC timestamp: " + scTimeMillis); boolean hasUserDataHeader = (firstByte & 0x40) == 0x40; @@ -1173,7 +1172,7 @@ public class SmsMessage extends SmsMessageBase { break; } - if (Config.LOGV) Log.v(LOG_TAG, "SMS message body (raw): '" + messageBody + "'"); + if (false) Log.v(LOG_TAG, "SMS message body (raw): '" + messageBody + "'"); if (messageBody != null) { parseMessageBody(); |