diff options
| author | Wink Saville <wink@google.com> | 2012-11-27 12:34:21 -0800 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2012-11-27 12:34:21 -0800 |
| commit | 99c2e1d6749cfad2a8ca94a47857d8c3bfc09454 (patch) | |
| tree | e8dcc09a142966197a8f9d254ef3fc2dcef3055e | |
| parent | d008821aacac55a7d4717fb52b85ab5590be30eb (diff) | |
| download | android_frameworks_opt_telephony-99c2e1d6749cfad2a8ca94a47857d8c3bfc09454.tar.gz android_frameworks_opt_telephony-99c2e1d6749cfad2a8ca94a47857d8c3bfc09454.tar.bz2 android_frameworks_opt_telephony-99c2e1d6749cfad2a8ca94a47857d8c3bfc09454.zip | |
Use Rlog instead of Log.
Change-Id: I2f44193b294513e743526e5c163e7d9a45308b28
99 files changed, 858 insertions, 944 deletions
diff --git a/src/java/android/provider/Telephony.java b/src/java/android/provider/Telephony.java index e932e2b27..50f3203fe 100644 --- a/src/java/android/provider/Telephony.java +++ b/src/java/android/provider/Telephony.java @@ -28,7 +28,7 @@ import android.net.Uri; import android.os.Environment; import android.telephony.SmsMessage; import android.text.TextUtils; -import android.util.Log; +import android.telephony.Rlog; import android.util.Patterns; @@ -1293,7 +1293,7 @@ public final class Telephony { } Uri uri = uriBuilder.build(); - //if (DEBUG) Log.v(TAG, "getOrCreateThreadId uri: " + uri); + //if (DEBUG) Rlog.v(TAG, "getOrCreateThreadId uri: " + uri); Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(), uri, ID_PROJECTION, null, null, null); @@ -1302,14 +1302,14 @@ public final class Telephony { if (cursor.moveToFirst()) { return cursor.getLong(0); } else { - Log.e(TAG, "getOrCreateThreadId returned no rows!"); + Rlog.e(TAG, "getOrCreateThreadId returned no rows!"); } } finally { cursor.close(); } } - Log.e(TAG, "getOrCreateThreadId failed with uri " + uri.toString()); + Rlog.e(TAG, "getOrCreateThreadId failed with uri " + uri.toString()); throw new IllegalArgumentException("Unable to find or allocate a thread ID."); } } diff --git a/src/java/android/telephony/Rlog.java b/src/java/android/telephony/Rlog.java deleted file mode 100644 index 08b7d61c1..000000000 --- a/src/java/android/telephony/Rlog.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.telephony; - -import com.android.internal.os.RuntimeInit; - -import android.util.Log; - -import java.io.PrintWriter; -import java.io.StringWriter; - -/** - * A class to log strings to the RADIO LOG. - * - * @hide - */ -public final class Rlog { - - private Rlog() { - } - - public static int v(String tag, String msg) { - return Log.println_native(Log.LOG_ID_RADIO, Log.VERBOSE, tag, msg); - } - - public static int v(String tag, String msg, Throwable tr) { - return Log.println_native(Log.LOG_ID_RADIO, Log.VERBOSE, tag, - msg + '\n' + Log.getStackTraceString(tr)); - } - - public static int d(String tag, String msg) { - return Log.println_native(Log.LOG_ID_RADIO, Log.DEBUG, tag, msg); - } - - public static int d(String tag, String msg, Throwable tr) { - return Log.println_native(Log.LOG_ID_RADIO, Log.DEBUG, tag, - msg + '\n' + Log.getStackTraceString(tr)); - } - - public static int i(String tag, String msg) { - return Log.println_native(Log.LOG_ID_RADIO, Log.INFO, tag, msg); - } - - public static int i(String tag, String msg, Throwable tr) { - return Log.println_native(Log.LOG_ID_RADIO, Log.INFO, tag, - msg + '\n' + Log.getStackTraceString(tr)); - } - - public static int w(String tag, String msg) { - return Log.println_native(Log.LOG_ID_RADIO, Log.WARN, tag, msg); - } - - public static int w(String tag, String msg, Throwable tr) { - return Log.println_native(Log.LOG_ID_RADIO, Log.WARN, tag, - msg + '\n' + Log.getStackTraceString(tr)); - } - - public static int w(String tag, Throwable tr) { - return Log.println_native(Log.LOG_ID_RADIO, Log.WARN, tag, Log.getStackTraceString(tr)); - } - - public static int e(String tag, String msg) { - return Log.println_native(Log.LOG_ID_RADIO, Log.ERROR, tag, msg); - } - - public static int e(String tag, String msg, Throwable tr) { - return Log.println_native(Log.LOG_ID_RADIO, Log.ERROR, tag, - msg + '\n' + Log.getStackTraceString(tr)); - } - - public static int println(int priority, String tag, String msg) { - return Log.println_native(Log.LOG_ID_RADIO, priority, tag, msg); - } -} - diff --git a/src/java/android/telephony/SmsMessage.java b/src/java/android/telephony/SmsMessage.java index b94609e49..c35f09eca 100644 --- a/src/java/android/telephony/SmsMessage.java +++ b/src/java/android/telephony/SmsMessage.java @@ -17,7 +17,7 @@ package android.telephony; import android.os.Parcel; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.GsmAlphabet; import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails; @@ -158,7 +158,7 @@ public class SmsMessage { } else if (SmsConstants.FORMAT_3GPP.equals(format)) { wrappedMessage = com.android.internal.telephony.gsm.SmsMessage.createFromPdu(pdu); } else { - Log.e(LOG_TAG, "createFromPdu(): unsupported message format " + format); + Rlog.e(LOG_TAG, "createFromPdu(): unsupported message format " + format); return null; } @@ -337,7 +337,7 @@ public class SmsMessage { nextPos = pos + Math.min(limit / 2, textLen - pos); } if ((nextPos <= pos) || (nextPos > textLen)) { - Log.e(LOG_TAG, "fragmentText failed (" + pos + " >= " + nextPos + " or " + + Rlog.e(LOG_TAG, "fragmentText failed (" + pos + " >= " + nextPos + " or " + nextPos + " >= " + textLen + ")"); break; } diff --git a/src/java/com/android/internal/telephony/AdnRecord.java b/src/java/com/android/internal/telephony/AdnRecord.java index 1bf2d3c61..6c51a22b5 100644 --- a/src/java/com/android/internal/telephony/AdnRecord.java +++ b/src/java/com/android/internal/telephony/AdnRecord.java @@ -20,7 +20,7 @@ import android.os.Parcel; import android.os.Parcelable; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; -import android.util.Log; +import android.telephony.Rlog; import java.util.Arrays; @@ -212,15 +212,15 @@ public class AdnRecord implements Parcelable { } if (TextUtils.isEmpty(number)) { - Log.w(LOG_TAG, "[buildAdnString] Empty dialing number"); + Rlog.w(LOG_TAG, "[buildAdnString] Empty dialing number"); return adnString; // return the empty record (for delete) } else if (number.length() > (ADN_DIALING_NUMBER_END - ADN_DIALING_NUMBER_START + 1) * 2) { - Log.w(LOG_TAG, + Rlog.w(LOG_TAG, "[buildAdnString] Max length of dialing number is 20"); return null; } else if (alphaTag != null && alphaTag.length() > footerOffset) { - Log.w(LOG_TAG, + Rlog.w(LOG_TAG, "[buildAdnString] Max length of tag is " + footerOffset); return null; } else { @@ -271,7 +271,7 @@ public class AdnRecord implements Parcelable { // We don't support ext record chaining. } catch (RuntimeException ex) { - Log.w(LOG_TAG, "Error parsing AdnRecord ext record", ex); + Rlog.w(LOG_TAG, "Error parsing AdnRecord ext record", ex); } } @@ -312,7 +312,7 @@ public class AdnRecord implements Parcelable { emails = null; } catch (RuntimeException ex) { - Log.w(LOG_TAG, "Error parsing AdnRecord", ex); + Rlog.w(LOG_TAG, "Error parsing AdnRecord", ex); number = ""; alphaTag = ""; emails = null; diff --git a/src/java/com/android/internal/telephony/AdnRecordCache.java b/src/java/com/android/internal/telephony/AdnRecordCache.java index db5f4da6b..d63507643 100644 --- a/src/java/com/android/internal/telephony/AdnRecordCache.java +++ b/src/java/com/android/internal/telephony/AdnRecordCache.java @@ -19,7 +19,7 @@ package com.android.internal.telephony; import android.os.AsyncResult; import android.os.Handler; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import android.util.SparseArray; import com.android.internal.telephony.gsm.UsimPhoneBookManager; diff --git a/src/java/com/android/internal/telephony/AdnRecordLoader.java b/src/java/com/android/internal/telephony/AdnRecordLoader.java index 084fae606..56d5793aa 100644 --- a/src/java/com/android/internal/telephony/AdnRecordLoader.java +++ b/src/java/com/android/internal/telephony/AdnRecordLoader.java @@ -22,7 +22,7 @@ import android.os.AsyncResult; import android.os.Handler; import android.os.Looper; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; public class AdnRecordLoader extends Handler { @@ -186,7 +186,7 @@ public class AdnRecordLoader extends Handler { } if (false) { - Log.d(LOG_TAG,"ADN EF: 0x" + Rlog.d(LOG_TAG,"ADN EF: 0x" + Integer.toHexString(ef) + ":" + recordNumber + "\n" + IccUtils.bytesToHexString(data)); @@ -217,7 +217,7 @@ public class AdnRecordLoader extends Handler { throw new RuntimeException("load failed", ar.exception); } - Log.d(LOG_TAG,"ADN extension EF: 0x" + Rlog.d(LOG_TAG,"ADN extension EF: 0x" + Integer.toHexString(extensionEF) + ":" + adn.extRecord + "\n" + IccUtils.bytesToHexString(data)); diff --git a/src/java/com/android/internal/telephony/ApnContext.java b/src/java/com/android/internal/telephony/ApnContext.java index 289bcc5bf..bf4735fb3 100644 --- a/src/java/com/android/internal/telephony/ApnContext.java +++ b/src/java/com/android/internal/telephony/ApnContext.java @@ -16,7 +16,7 @@ package com.android.internal.telephony; -import android.util.Log; +import android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -239,7 +239,7 @@ public class ApnContext { } protected void log(String s) { - Log.d(LOG_TAG, "[ApnContext:" + mApnType + "] " + s); + Rlog.d(LOG_TAG, "[ApnContext:" + mApnType + "] " + s); } public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { diff --git a/src/java/com/android/internal/telephony/BaseCommands.java b/src/java/com/android/internal/telephony/BaseCommands.java index 4336127e2..d059931cd 100644 --- a/src/java/com/android/internal/telephony/BaseCommands.java +++ b/src/java/com/android/internal/telephony/BaseCommands.java @@ -24,7 +24,7 @@ import android.os.Handler; import android.os.AsyncResult; import android.os.SystemProperties; import android.telephony.TelephonyManager; -import android.util.Log; +import android.telephony.Rlog; import java.io.FileInputStream; import java.io.IOException; @@ -555,11 +555,11 @@ public abstract class BaseCommands implements CommandsInterface { */ @Override public void registerForRilConnected(Handler h, int what, Object obj) { - Log.d(LOG_TAG, "registerForRilConnected h=" + h + " w=" + what); + Rlog.d(LOG_TAG, "registerForRilConnected h=" + h + " w=" + what); Registrant r = new Registrant (h, what, obj); mRilConnectedRegistrants.add(r); if (mRilVersion != -1) { - Log.d(LOG_TAG, "Notifying: ril connected mRilVersion=" + mRilVersion); + Rlog.d(LOG_TAG, "Notifying: ril connected mRilVersion=" + mRilVersion); r.notifyRegistrant(new AsyncResult(null, new Integer(mRilVersion), null)); } } @@ -592,7 +592,7 @@ public abstract class BaseCommands implements CommandsInterface { synchronized (mStateMonitor) { if (false) { - Log.v(LOG_TAG, "setRadioState old: " + mState + Rlog.v(LOG_TAG, "setRadioState old: " + mState + " new " + newState); } @@ -607,25 +607,25 @@ public abstract class BaseCommands implements CommandsInterface { mRadioStateChangedRegistrants.notifyRegistrants(); if (mState.isAvailable() && !oldState.isAvailable()) { - Log.d(LOG_TAG,"Notifying: radio available"); + Rlog.d(LOG_TAG,"Notifying: radio available"); mAvailRegistrants.notifyRegistrants(); onRadioAvailable(); } if (!mState.isAvailable() && oldState.isAvailable()) { - Log.d(LOG_TAG,"Notifying: radio not available"); + Rlog.d(LOG_TAG,"Notifying: radio not available"); mNotAvailRegistrants.notifyRegistrants(); } if (mState.isOn() && !oldState.isOn()) { - Log.d(LOG_TAG,"Notifying: Radio On"); + Rlog.d(LOG_TAG,"Notifying: Radio On"); mOnRegistrants.notifyRegistrants(); } if ((!mState.isOn() || !mState.isAvailable()) && !((!oldState.isOn() || !oldState.isAvailable())) ) { - Log.d(LOG_TAG,"Notifying: radio off or not available"); + Rlog.d(LOG_TAG,"Notifying: radio off or not available"); mOffOrNotAvailRegistrants.notifyRegistrants(); } } diff --git a/src/java/com/android/internal/telephony/Call.java b/src/java/com/android/internal/telephony/Call.java index 4967ab81e..2127258ff 100644 --- a/src/java/com/android/internal/telephony/Call.java +++ b/src/java/com/android/internal/telephony/Call.java @@ -18,7 +18,7 @@ package com.android.internal.telephony; import java.util.List; -import android.util.Log; +import android.telephony.Rlog; /** * {@hide} @@ -248,7 +248,7 @@ public abstract class Call { try { hangup(); } catch (CallStateException ex) { - Log.w(LOG_TAG, " hangupIfActive: caught " + ex); + Rlog.w(LOG_TAG, " hangupIfActive: caught " + ex); } } } diff --git a/src/java/com/android/internal/telephony/CallManager.java b/src/java/com/android/internal/telephony/CallManager.java index b87ea50c6..7d696b433 100644 --- a/src/java/com/android/internal/telephony/CallManager.java +++ b/src/java/com/android/internal/telephony/CallManager.java @@ -27,7 +27,7 @@ import android.os.RegistrantList; import android.os.Registrant; import android.telephony.PhoneStateListener; import android.telephony.ServiceState; -import android.util.Log; +import android.telephony.Rlog; import java.util.ArrayList; import java.util.Collections; @@ -293,7 +293,7 @@ public final class CallManager { if (basePhone != null && !mPhones.contains(basePhone)) { if (DBG) { - Log.d(LOG_TAG, "registerPhone(" + + Rlog.d(LOG_TAG, "registerPhone(" + phone.getPhoneName() + " " + phone + ")"); } @@ -320,7 +320,7 @@ public final class CallManager { if (basePhone != null && mPhones.contains(basePhone)) { if (DBG) { - Log.d(LOG_TAG, "unregisterPhone(" + + Rlog.d(LOG_TAG, "unregisterPhone(" + phone.getPhoneName() + " " + phone + ")"); } @@ -380,7 +380,7 @@ public final class CallManager { if (audioManager.getMode() != AudioManager.MODE_RINGTONE) { // only request audio focus if the ringtone is going to be heard if (audioManager.getStreamVolume(AudioManager.STREAM_RING) > 0) { - if (VDBG) Log.d(LOG_TAG, "requestAudioFocus on STREAM_RING"); + if (VDBG) Rlog.d(LOG_TAG, "requestAudioFocus on STREAM_RING"); audioManager.requestAudioFocusForCall(AudioManager.STREAM_RING, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT); } @@ -402,7 +402,7 @@ public final class CallManager { } if (audioManager.getMode() != newAudioMode) { // request audio focus before setting the new mode - if (VDBG) Log.d(LOG_TAG, "requestAudioFocus on STREAM_VOICE_CALL"); + if (VDBG) Rlog.d(LOG_TAG, "requestAudioFocus on STREAM_VOICE_CALL"); audioManager.requestAudioFocusForCall(AudioManager.STREAM_VOICE_CALL, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT); audioManager.setMode(newAudioMode); @@ -411,7 +411,7 @@ public final class CallManager { case IDLE: if (audioManager.getMode() != AudioManager.MODE_NORMAL) { audioManager.setMode(AudioManager.MODE_NORMAL); - if (VDBG) Log.d(LOG_TAG, "abandonAudioFocus"); + if (VDBG) Rlog.d(LOG_TAG, "abandonAudioFocus"); // abandon audio focus after the mode has been set back to normal audioManager.abandonAudioFocusForCall(); } @@ -507,8 +507,8 @@ public final class CallManager { Phone ringingPhone = ringingCall.getPhone(); if (VDBG) { - Log.d(LOG_TAG, "acceptCall(" +ringingCall + " from " + ringingCall.getPhone() + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "acceptCall(" +ringingCall + " from " + ringingCall.getPhone() + ")"); + Rlog.d(LOG_TAG, this.toString()); } if ( hasActiveFgCall() ) { @@ -517,7 +517,7 @@ public final class CallManager { boolean sameChannel = (activePhone == ringingPhone); if (VDBG) { - Log.d(LOG_TAG, "hasBgCall: "+ hasBgCall + "sameChannel:" + sameChannel); + Rlog.d(LOG_TAG, "hasBgCall: "+ hasBgCall + "sameChannel:" + sameChannel); } if (sameChannel && hasBgCall) { @@ -532,8 +532,8 @@ public final class CallManager { ringingPhone.acceptCall(); if (VDBG) { - Log.d(LOG_TAG, "End acceptCall(" +ringingCall + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "End acceptCall(" +ringingCall + ")"); + Rlog.d(LOG_TAG, this.toString()); } } @@ -548,8 +548,8 @@ public final class CallManager { */ public void rejectCall(Call ringingCall) throws CallStateException { if (VDBG) { - Log.d(LOG_TAG, "rejectCall(" +ringingCall + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "rejectCall(" +ringingCall + ")"); + Rlog.d(LOG_TAG, this.toString()); } Phone ringingPhone = ringingCall.getPhone(); @@ -557,8 +557,8 @@ public final class CallManager { ringingPhone.rejectCall(); if (VDBG) { - Log.d(LOG_TAG, "End rejectCall(" +ringingCall + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "End rejectCall(" +ringingCall + ")"); + Rlog.d(LOG_TAG, this.toString()); } } @@ -585,8 +585,8 @@ public final class CallManager { Phone heldPhone = null; if (VDBG) { - Log.d(LOG_TAG, "switchHoldingAndActive(" +heldCall + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "switchHoldingAndActive(" +heldCall + ")"); + Rlog.d(LOG_TAG, this.toString()); } if (hasActiveFgCall()) { @@ -606,8 +606,8 @@ public final class CallManager { } if (VDBG) { - Log.d(LOG_TAG, "End switchHoldingAndActive(" +heldCall + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "End switchHoldingAndActive(" +heldCall + ")"); + Rlog.d(LOG_TAG, this.toString()); } } @@ -624,8 +624,8 @@ public final class CallManager { Phone backgroundPhone = null; if (VDBG) { - Log.d(LOG_TAG, "hangupForegroundResumeBackground(" +heldCall + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "hangupForegroundResumeBackground(" +heldCall + ")"); + Rlog.d(LOG_TAG, this.toString()); } if (hasActiveFgCall()) { @@ -643,8 +643,8 @@ public final class CallManager { } if (VDBG) { - Log.d(LOG_TAG, "End hangupForegroundResumeBackground(" +heldCall + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "End hangupForegroundResumeBackground(" +heldCall + ")"); + Rlog.d(LOG_TAG, this.toString()); } } @@ -680,8 +680,8 @@ public final class CallManager { public void conference(Call heldCall) throws CallStateException { if (VDBG) { - Log.d(LOG_TAG, "conference(" +heldCall + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "conference(" +heldCall + ")"); + Rlog.d(LOG_TAG, this.toString()); } @@ -695,8 +695,8 @@ public final class CallManager { } if (VDBG) { - Log.d(LOG_TAG, "End conference(" +heldCall + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "End conference(" +heldCall + ")"); + Rlog.d(LOG_TAG, this.toString()); } } @@ -716,8 +716,8 @@ public final class CallManager { Connection result; if (VDBG) { - Log.d(LOG_TAG, " dial(" + basePhone + ", "+ dialString + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, " dial(" + basePhone + ", "+ dialString + ")"); + Rlog.d(LOG_TAG, this.toString()); } if (!canDial(phone)) { @@ -729,15 +729,15 @@ public final class CallManager { boolean hasBgCall = !(activePhone.getBackgroundCall().isIdle()); if (DBG) { - Log.d(LOG_TAG, "hasBgCall: "+ hasBgCall + " sameChannel:" + (activePhone == basePhone)); + Rlog.d(LOG_TAG, "hasBgCall: "+ hasBgCall + " sameChannel:" + (activePhone == basePhone)); } if (activePhone != basePhone) { if (hasBgCall) { - Log.d(LOG_TAG, "Hangup"); + Rlog.d(LOG_TAG, "Hangup"); getActiveFgCall().hangup(); } else { - Log.d(LOG_TAG, "Switch"); + Rlog.d(LOG_TAG, "Switch"); activePhone.switchHoldingAndActive(); } } @@ -746,8 +746,8 @@ public final class CallManager { result = basePhone.dial(dialString); if (VDBG) { - Log.d(LOG_TAG, "End dial(" + basePhone + ", "+ dialString + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "End dial(" + basePhone + ", "+ dialString + ")"); + Rlog.d(LOG_TAG, this.toString()); } return result; @@ -802,7 +802,7 @@ public final class CallManager { || (fgCallState == Call.State.DISCONNECTED))); if (result == false) { - Log.d(LOG_TAG, "canDial serviceState=" + serviceState + Rlog.d(LOG_TAG, "canDial serviceState=" + serviceState + " hasRingingCall=" + hasRingingCall + " hasActiveCall=" + hasActiveCall + " hasHoldingCall=" + hasHoldingCall @@ -846,8 +846,8 @@ public final class CallManager { */ public void explicitCallTransfer(Call heldCall) throws CallStateException { if (VDBG) { - Log.d(LOG_TAG, " explicitCallTransfer(" + heldCall + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, " explicitCallTransfer(" + heldCall + ")"); + Rlog.d(LOG_TAG, this.toString()); } if (canTransfer(heldCall)) { @@ -855,8 +855,8 @@ public final class CallManager { } if (VDBG) { - Log.d(LOG_TAG, "End explicitCallTransfer(" + heldCall + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "End explicitCallTransfer(" + heldCall + ")"); + Rlog.d(LOG_TAG, this.toString()); } } @@ -871,7 +871,7 @@ public final class CallManager { * @return null if phone doesn't have or support mmi code */ public List<? extends MmiCode> getPendingMmiCodes(Phone phone) { - Log.e(LOG_TAG, "getPendingMmiCodes not implemented"); + Rlog.e(LOG_TAG, "getPendingMmiCodes not implemented"); return null; } @@ -884,7 +884,7 @@ public final class CallManager { * @return false if phone doesn't support ussd service */ public boolean sendUssdResponse(Phone phone, String ussdMessge) { - Log.e(LOG_TAG, "sendUssdResponse not implemented"); + Rlog.e(LOG_TAG, "sendUssdResponse not implemented"); return false; } @@ -899,8 +899,8 @@ public final class CallManager { public void setMute(boolean muted) { if (VDBG) { - Log.d(LOG_TAG, " setMute(" + muted + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, " setMute(" + muted + ")"); + Rlog.d(LOG_TAG, this.toString()); } if (hasActiveFgCall()) { @@ -908,8 +908,8 @@ public final class CallManager { } if (VDBG) { - Log.d(LOG_TAG, "End setMute(" + muted + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "End setMute(" + muted + ")"); + Rlog.d(LOG_TAG, this.toString()); } } @@ -936,8 +936,8 @@ public final class CallManager { */ public void setEchoSuppressionEnabled(boolean enabled) { if (VDBG) { - Log.d(LOG_TAG, " setEchoSuppression(" + enabled + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, " setEchoSuppression(" + enabled + ")"); + Rlog.d(LOG_TAG, this.toString()); } if (hasActiveFgCall()) { @@ -945,8 +945,8 @@ public final class CallManager { } if (VDBG) { - Log.d(LOG_TAG, "End setEchoSuppression(" + enabled + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "End setEchoSuppression(" + enabled + ")"); + Rlog.d(LOG_TAG, this.toString()); } } @@ -962,8 +962,8 @@ public final class CallManager { boolean result = false; if (VDBG) { - Log.d(LOG_TAG, " sendDtmf(" + c + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, " sendDtmf(" + c + ")"); + Rlog.d(LOG_TAG, this.toString()); } if (hasActiveFgCall()) { @@ -972,8 +972,8 @@ public final class CallManager { } if (VDBG) { - Log.d(LOG_TAG, "End sendDtmf(" + c + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "End sendDtmf(" + c + ")"); + Rlog.d(LOG_TAG, this.toString()); } return result; } @@ -991,8 +991,8 @@ public final class CallManager { boolean result = false; if (VDBG) { - Log.d(LOG_TAG, " startDtmf(" + c + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, " startDtmf(" + c + ")"); + Rlog.d(LOG_TAG, this.toString()); } if (hasActiveFgCall()) { @@ -1001,8 +1001,8 @@ public final class CallManager { } if (VDBG) { - Log.d(LOG_TAG, "End startDtmf(" + c + ")"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "End startDtmf(" + c + ")"); + Rlog.d(LOG_TAG, this.toString()); } return result; @@ -1014,15 +1014,15 @@ public final class CallManager { */ public void stopDtmf() { if (VDBG) { - Log.d(LOG_TAG, " stopDtmf()" ); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, " stopDtmf()" ); + Rlog.d(LOG_TAG, this.toString()); } if (hasActiveFgCall()) getFgPhone().stopDtmf(); if (VDBG) { - Log.d(LOG_TAG, "End stopDtmf()"); - Log.d(LOG_TAG, this.toString()); + Rlog.d(LOG_TAG, "End stopDtmf()"); + Rlog.d(LOG_TAG, this.toString()); } } @@ -1714,98 +1714,98 @@ public final class CallManager { switch (msg.what) { case EVENT_DISCONNECT: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_DISCONNECT)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_DISCONNECT)"); mDisconnectRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_PRECISE_CALL_STATE_CHANGED: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_PRECISE_CALL_STATE_CHANGED)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_PRECISE_CALL_STATE_CHANGED)"); mPreciseCallStateRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_NEW_RINGING_CONNECTION: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_NEW_RINGING_CONNECTION)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_NEW_RINGING_CONNECTION)"); if (getActiveFgCallState().isDialing() || hasMoreThanOneRingingCall()) { Connection c = (Connection) ((AsyncResult) msg.obj).result; try { - Log.d(LOG_TAG, "silently drop incoming call: " + c.getCall()); + Rlog.d(LOG_TAG, "silently drop incoming call: " + c.getCall()); c.getCall().hangup(); } catch (CallStateException e) { - Log.w(LOG_TAG, "new ringing connection", e); + Rlog.w(LOG_TAG, "new ringing connection", e); } } else { mNewRingingConnectionRegistrants.notifyRegistrants((AsyncResult) msg.obj); } break; case EVENT_UNKNOWN_CONNECTION: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_UNKNOWN_CONNECTION)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_UNKNOWN_CONNECTION)"); mUnknownConnectionRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_INCOMING_RING: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_INCOMING_RING)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_INCOMING_RING)"); // The event may come from RIL who's not aware of an ongoing fg call if (!hasActiveFgCall()) { mIncomingRingRegistrants.notifyRegistrants((AsyncResult) msg.obj); } break; case EVENT_RINGBACK_TONE: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_RINGBACK_TONE)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_RINGBACK_TONE)"); mRingbackToneRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_IN_CALL_VOICE_PRIVACY_ON: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_IN_CALL_VOICE_PRIVACY_ON)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_IN_CALL_VOICE_PRIVACY_ON)"); mInCallVoicePrivacyOnRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_IN_CALL_VOICE_PRIVACY_OFF: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_IN_CALL_VOICE_PRIVACY_OFF)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_IN_CALL_VOICE_PRIVACY_OFF)"); mInCallVoicePrivacyOffRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_CALL_WAITING: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_CALL_WAITING)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_CALL_WAITING)"); mCallWaitingRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_DISPLAY_INFO: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_DISPLAY_INFO)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_DISPLAY_INFO)"); mDisplayInfoRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_SIGNAL_INFO: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_SIGNAL_INFO)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_SIGNAL_INFO)"); mSignalInfoRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_CDMA_OTA_STATUS_CHANGE: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_CDMA_OTA_STATUS_CHANGE)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_CDMA_OTA_STATUS_CHANGE)"); mCdmaOtaStatusChangeRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_RESEND_INCALL_MUTE: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_RESEND_INCALL_MUTE)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_RESEND_INCALL_MUTE)"); mResendIncallMuteRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_MMI_INITIATE: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_MMI_INITIATE)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_MMI_INITIATE)"); mMmiInitiateRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_MMI_COMPLETE: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_MMI_COMPLETE)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_MMI_COMPLETE)"); mMmiCompleteRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_ECM_TIMER_RESET: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_ECM_TIMER_RESET)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_ECM_TIMER_RESET)"); mEcmTimerResetRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_SUBSCRIPTION_INFO_READY: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_SUBSCRIPTION_INFO_READY)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_SUBSCRIPTION_INFO_READY)"); mSubscriptionInfoReadyRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_SUPP_SERVICE_FAILED: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_SUPP_SERVICE_FAILED)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_SUPP_SERVICE_FAILED)"); mSuppServiceFailedRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_SERVICE_STATE_CHANGED: - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_SERVICE_STATE_CHANGED)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_SERVICE_STATE_CHANGED)"); mServiceStateChangedRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_POST_DIAL_CHARACTER: // we need send the character that is being processed in msg.arg1 // so can't use notifyRegistrants() - if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_POST_DIAL_CHARACTER)"); + if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_POST_DIAL_CHARACTER)"); for(int i=0; i < mPostDialCharacterRegistrants.size(); i++) { Message notifyMsg; notifyMsg = ((Registrant)mPostDialCharacterRegistrants.get(i)).messageForRegistrant(); diff --git a/src/java/com/android/internal/telephony/CallTracker.java b/src/java/com/android/internal/telephony/CallTracker.java index 62caf01df..efe53c9af 100644 --- a/src/java/com/android/internal/telephony/CallTracker.java +++ b/src/java/com/android/internal/telephony/CallTracker.java @@ -21,7 +21,7 @@ import android.os.Handler; import android.os.Message; import android.os.SystemProperties; import android.text.TextUtils; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.CommandException; diff --git a/src/java/com/android/internal/telephony/CommandException.java b/src/java/com/android/internal/telephony/CommandException.java index 94c544ecf..d1085f613 100644 --- a/src/java/com/android/internal/telephony/CommandException.java +++ b/src/java/com/android/internal/telephony/CommandException.java @@ -18,7 +18,7 @@ package com.android.internal.telephony; import com.android.internal.telephony.RILConstants; -import android.util.Log; +import android.telephony.Rlog; /** * {@hide} @@ -84,7 +84,7 @@ public class CommandException extends RuntimeException { case RILConstants.ILLEGAL_SIM_OR_ME: return new CommandException(Error.ILLEGAL_SIM_OR_ME); default: - Log.e("GSM", "Unrecognized RIL errno " + ril_errno); + Rlog.e("GSM", "Unrecognized RIL errno " + ril_errno); return new CommandException(Error.INVALID_RESPONSE); } } diff --git a/src/java/com/android/internal/telephony/CommandsInterface.java b/src/java/com/android/internal/telephony/CommandsInterface.java index b1244ab14..2157643f9 100644 --- a/src/java/com/android/internal/telephony/CommandsInterface.java +++ b/src/java/com/android/internal/telephony/CommandsInterface.java @@ -20,7 +20,7 @@ import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo; import android.os.Message; import android.os.Handler; -import android.util.Log; +import android.telephony.Rlog; /** * {@hide} diff --git a/src/java/com/android/internal/telephony/Connection.java b/src/java/com/android/internal/telephony/Connection.java index 554d974b8..8e10af579 100644 --- a/src/java/com/android/internal/telephony/Connection.java +++ b/src/java/com/android/internal/telephony/Connection.java @@ -16,6 +16,7 @@ package com.android.internal.telephony; +import android.telephony.Rlog; import android.util.Log; /** @@ -293,7 +294,7 @@ public abstract class Connection { public String toString() { StringBuilder str = new StringBuilder(128); - if (Log.isLoggable(LOG_TAG, Log.DEBUG)) { + if (Rlog.isLoggable(LOG_TAG, Log.DEBUG)) { str.append("addr: " + getAddress()) .append(" pres.: " + getNumberPresentation()) .append(" dial: " + getOrigDialString()) diff --git a/src/java/com/android/internal/telephony/CsimFileHandler.java b/src/java/com/android/internal/telephony/CsimFileHandler.java index 979d1d214..c9b23a47e 100644 --- a/src/java/com/android/internal/telephony/CsimFileHandler.java +++ b/src/java/com/android/internal/telephony/CsimFileHandler.java @@ -16,7 +16,7 @@ package com.android.internal.telephony; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.IccConstants; @@ -61,11 +61,11 @@ public final class CsimFileHandler extends IccFileHandler implements IccConstant @Override protected void logd(String msg) { - Log.d(LOG_TAG, msg); + Rlog.d(LOG_TAG, msg); } @Override protected void loge(String msg) { - Log.e(LOG_TAG, msg); + Rlog.e(LOG_TAG, msg); } } diff --git a/src/java/com/android/internal/telephony/DataCallState.java b/src/java/com/android/internal/telephony/DataCallState.java index efbf608d9..c3a3b1d30 100644 --- a/src/java/com/android/internal/telephony/DataCallState.java +++ b/src/java/com/android/internal/telephony/DataCallState.java @@ -22,7 +22,7 @@ import android.net.LinkProperties; import android.net.NetworkUtils; import android.net.RouteInfo; import android.os.SystemProperties; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.DataConnection.FailCause; @@ -149,7 +149,7 @@ public class DataCallState { // Assume point to point addrPrefixLen = (ia instanceof Inet4Address) ? 32 : 128; } - if (DBG) Log.d(LOG_TAG, "addr/pl=" + addr + "/" + addrPrefixLen); + if (DBG) Rlog.d(LOG_TAG, "addr/pl=" + addr + "/" + addrPrefixLen); la = new LinkAddress(ia, addrPrefixLen); linkProperties.addLinkAddress(la); } @@ -219,7 +219,7 @@ public class DataCallState { result = SetupResult.SUCCESS; } catch (UnknownHostException e) { - Log.d(LOG_TAG, "setLinkProperties: UnknownHostException " + e); + Rlog.d(LOG_TAG, "setLinkProperties: UnknownHostException " + e); e.printStackTrace(); result = SetupResult.ERR_UnacceptableParameter; } @@ -234,7 +234,7 @@ public class DataCallState { // An error occurred so clear properties if (result != SetupResult.SUCCESS) { if(DBG) { - Log.d(LOG_TAG, "setLinkProperties: error clearing LinkProperties " + + Rlog.d(LOG_TAG, "setLinkProperties: error clearing LinkProperties " + "status=" + status + " result=" + result); } linkProperties.clear(); diff --git a/src/java/com/android/internal/telephony/DataConnection.java b/src/java/com/android/internal/telephony/DataConnection.java index 0fb3fa203..d3dec5f5d 100644 --- a/src/java/com/android/internal/telephony/DataConnection.java +++ b/src/java/com/android/internal/telephony/DataConnection.java @@ -35,7 +35,7 @@ import android.os.AsyncResult; import android.os.Message; import android.os.SystemProperties; import android.text.TextUtils; -import android.util.Log; +import android.telephony.Rlog; import android.util.TimeUtils; import java.io.FileDescriptor; @@ -198,7 +198,7 @@ public abstract class DataConnection extends StateMachine { * Static logging for DataConnection */ private static void sDcLog(String s) { - Log.d(GSM_TAG, "[DC] " + s); + Rlog.d(GSM_TAG, "[DC] " + s); } // Debugging INTENT with are two targets, com.android.internal.telephony.DC which diff --git a/src/java/com/android/internal/telephony/DataConnectionAc.java b/src/java/com/android/internal/telephony/DataConnectionAc.java index a24414ff3..2cd64e11a 100644 --- a/src/java/com/android/internal/telephony/DataConnectionAc.java +++ b/src/java/com/android/internal/telephony/DataConnectionAc.java @@ -586,6 +586,6 @@ public class DataConnectionAc extends AsyncChannel { } private void log(String s) { - android.util.Log.d(mLogTag, "DataConnectionAc " + s); + android.telephony.Rlog.d(mLogTag, "DataConnectionAc " + s); } } diff --git a/src/java/com/android/internal/telephony/DataConnectionTracker.java b/src/java/com/android/internal/telephony/DataConnectionTracker.java index 50e78d0e4..003ef90f3 100644 --- a/src/java/com/android/internal/telephony/DataConnectionTracker.java +++ b/src/java/com/android/internal/telephony/DataConnectionTracker.java @@ -44,7 +44,7 @@ import android.telephony.ServiceState; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.EventLog; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.R; import com.android.internal.telephony.DataConnection.FailCause; @@ -670,7 +670,7 @@ public abstract class DataConnectionTracker extends Handler { break; default: - Log.e("DATA", "Unidentified event msg=" + msg); + Rlog.e("DATA", "Unidentified event msg=" + msg); break; } } diff --git a/src/java/com/android/internal/telephony/DebugService.java b/src/java/com/android/internal/telephony/DebugService.java index 29fea6e83..82543ae0f 100644 --- a/src/java/com/android/internal/telephony/DebugService.java +++ b/src/java/com/android/internal/telephony/DebugService.java @@ -16,7 +16,7 @@ package com.android.internal.telephony; -import android.util.Log; +import android.telephony.Rlog; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -103,6 +103,6 @@ public class DebugService { } private static void log(String s) { - Log.d(TAG, "DebugService " + s); + Rlog.d(TAG, "DebugService " + s); } } diff --git a/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java b/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java index 157fee6f8..8f4ae84ad 100644 --- a/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java +++ b/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java @@ -24,7 +24,7 @@ import android.os.ServiceManager; import android.telephony.CellInfo; import android.telephony.ServiceState; import android.telephony.TelephonyManager; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.ITelephonyRegistry; @@ -176,7 +176,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier { } private void log(String s) { - Log.d(LOG_TAG, "[PhoneNotifier] " + s); + Rlog.d(LOG_TAG, "[PhoneNotifier] " + s); } /** diff --git a/src/java/com/android/internal/telephony/DriverCall.java b/src/java/com/android/internal/telephony/DriverCall.java index b1e63aef2..c76be5f65 100644 --- a/src/java/com/android/internal/telephony/DriverCall.java +++ b/src/java/com/android/internal/telephony/DriverCall.java @@ -16,7 +16,7 @@ package com.android.internal.telephony; //import com.android.internal.telephony.*; -import android.util.Log; +import android.telephony.Rlog; import java.lang.Comparable; import android.telephony.PhoneNumberUtils; @@ -90,7 +90,7 @@ public class DriverCall implements Comparable { } } catch (ATParseEx ex) { - Log.e(LOG_TAG,"Invalid CLCC line: '" + line + "'"); + Rlog.e(LOG_TAG,"Invalid CLCC line: '" + line + "'"); return null; } diff --git a/src/java/com/android/internal/telephony/IccCardProxy.java b/src/java/com/android/internal/telephony/IccCardProxy.java index cdd2fea35..3c949d81d 100644 --- a/src/java/com/android/internal/telephony/IccCardProxy.java +++ b/src/java/com/android/internal/telephony/IccCardProxy.java @@ -27,7 +27,7 @@ import android.os.Registrant; import android.os.RegistrantList; import android.os.SystemProperties; import android.os.UserHandle; -import android.util.Log; +import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.TelephonyManager; @@ -687,10 +687,10 @@ public class IccCardProxy extends Handler implements IccCard { } private void log(String s) { - Log.d(LOG_TAG, s); + Rlog.d(LOG_TAG, s); } private void loge(String msg) { - Log.e(LOG_TAG, msg); + Rlog.e(LOG_TAG, msg); } } diff --git a/src/java/com/android/internal/telephony/IccFileHandler.java b/src/java/com/android/internal/telephony/IccFileHandler.java index 98ab17b30..5f6a7551d 100644 --- a/src/java/com/android/internal/telephony/IccFileHandler.java +++ b/src/java/com/android/internal/telephony/IccFileHandler.java @@ -17,7 +17,7 @@ package com.android.internal.telephony; import android.os.*; -import android.util.Log; +import android.telephony.Rlog; import java.util.ArrayList; /** diff --git a/src/java/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java b/src/java/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java index 1c0fc52e7..2ba0ce1d9 100644 --- a/src/java/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java +++ b/src/java/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java @@ -23,7 +23,7 @@ import android.os.Looper; import android.os.Message; import android.os.ServiceManager; import android.telephony.PhoneNumberUtils; -import android.util.Log; +import android.telephony.Rlog; import java.util.ArrayList; import java.util.List; diff --git a/src/java/com/android/internal/telephony/IccProvider.java b/src/java/com/android/internal/telephony/IccProvider.java index a66e19d15..4feffb871 100644 --- a/src/java/com/android/internal/telephony/IccProvider.java +++ b/src/java/com/android/internal/telephony/IccProvider.java @@ -25,7 +25,7 @@ import android.net.Uri; import android.os.RemoteException; import android.os.ServiceManager; import android.text.TextUtils; -import android.util.Log; +import android.telephony.Rlog; import java.util.List; @@ -210,7 +210,7 @@ public class IccProvider extends ContentProvider { String[] pair = param.split("="); if (pair.length != 2) { - Log.e(TAG, "resolve: bad whereClause parameter: " + param); + Rlog.e(TAG, "resolve: bad whereClause parameter: " + param); continue; } @@ -312,7 +312,7 @@ public class IccProvider extends ContentProvider { return cursor; } else { // No results to load - Log.w(TAG, "Cannot load ADN records"); + Rlog.w(TAG, "Cannot load ADN records"); return new MatrixCursor(ADDRESS_BOOK_COLUMN_NAMES); } } @@ -425,7 +425,7 @@ public class IccProvider extends ContentProvider { } private void log(String msg) { - Log.d(TAG, "[IccProvider] " + msg); + Rlog.d(TAG, "[IccProvider] " + msg); } } diff --git a/src/java/com/android/internal/telephony/IccServiceTable.java b/src/java/com/android/internal/telephony/IccServiceTable.java index ed74a1175..51cfd83cc 100644 --- a/src/java/com/android/internal/telephony/IccServiceTable.java +++ b/src/java/com/android/internal/telephony/IccServiceTable.java @@ -16,7 +16,7 @@ package com.android.internal.telephony; -import android.util.Log; +import android.telephony.Rlog; /** * Wrapper class for an ICC EF containing a bit field of enabled services. @@ -43,7 +43,7 @@ public abstract class IccServiceTable { int offset = service / 8; if (offset >= mServiceTable.length) { // Note: Enums are zero-based, but the TS service numbering is one-based - Log.e(getTag(), "isAvailable for service " + (service + 1) + " fails, max service is " + + Rlog.e(getTag(), "isAvailable for service " + (service + 1) + " fails, max service is " + (mServiceTable.length * 8)); return false; } diff --git a/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java b/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java index 525bcd993..45972e77b 100644 --- a/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java +++ b/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java @@ -18,6 +18,7 @@ package com.android.internal.telephony; import android.app.PendingIntent; import android.content.Context; +import android.telephony.Rlog; import android.util.Log; import com.android.internal.util.HexDump; @@ -78,7 +79,7 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub { mPhone.getContext().enforceCallingPermission( "android.permission.SEND_SMS", "Sending SMS message"); - if (Log.isLoggable("SMS", Log.VERBOSE)) { + if (Rlog.isLoggable("SMS", Log.VERBOSE)) { log("sendData: destAddr=" + destAddr + " scAddr=" + scAddr + " destPort=" + destPort + " data='"+ HexDump.toHexString(data) + "' sentIntent=" + sentIntent + " deliveryIntent=" + deliveryIntent); @@ -115,7 +116,7 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub { mPhone.getContext().enforceCallingPermission( "android.permission.SEND_SMS", "Sending SMS message"); - if (Log.isLoggable("SMS", Log.VERBOSE)) { + if (Rlog.isLoggable("SMS", Log.VERBOSE)) { log("sendText: destAddr=" + destAddr + " scAddr=" + scAddr + " text='"+ text + "' sentIntent=" + sentIntent + " deliveryIntent=" + deliveryIntent); @@ -153,7 +154,7 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub { mPhone.getContext().enforceCallingPermission( "android.permission.SEND_SMS", "Sending SMS message"); - if (Log.isLoggable("SMS", Log.VERBOSE)) { + if (Rlog.isLoggable("SMS", Log.VERBOSE)) { int i = 0; for (String part : parts) { log("sendMultipartText: destAddr=" + destAddr + ", srAddr=" + scAddr + diff --git a/src/java/com/android/internal/telephony/IccUtils.java b/src/java/com/android/internal/telephony/IccUtils.java index a966f7694..795740c0c 100644 --- a/src/java/com/android/internal/telephony/IccUtils.java +++ b/src/java/com/android/internal/telephony/IccUtils.java @@ -20,7 +20,7 @@ import android.content.res.Resources; import android.content.res.Resources.NotFoundException; import android.graphics.Bitmap; import android.graphics.Color; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.GsmAlphabet; import java.io.UnsupportedEncodingException; @@ -187,7 +187,7 @@ public class IccUtils { try { ret = new String(data, offset + 1, ucslen * 2, "utf-16be"); } catch (UnsupportedEncodingException ex) { - Log.e(LOG_TAG, "implausible UnsupportedEncodingException", + Rlog.e(LOG_TAG, "implausible UnsupportedEncodingException", ex); } @@ -360,7 +360,7 @@ public class IccUtils { offset + 1, length - 1, "utf-16"); } catch (UnsupportedEncodingException ex) { ret = ""; - Log.e(LOG_TAG,"implausible UnsupportedEncodingException", ex); + Rlog.e(LOG_TAG,"implausible UnsupportedEncodingException", ex); } break; @@ -409,7 +409,7 @@ public class IccUtils { }; if (pixelIndex != numOfPixels) { - Log.e(LOG_TAG, "parse end and size error"); + Rlog.e(LOG_TAG, "parse end and size error"); } return Bitmap.createBitmap(pixels, width, height, Bitmap.Config.ARGB_8888); } @@ -461,7 +461,7 @@ public class IccUtils { private static int[] mapTo2OrderBitColor(byte[] data, int valueIndex, int length, int[] colorArray, int bits) { if (0 != (8 % bits)) { - Log.e(LOG_TAG, "not event number of color"); + Rlog.e(LOG_TAG, "not event number of color"); return mapToNon2OrderBitColor(data, valueIndex, length, colorArray, bits); } @@ -499,7 +499,7 @@ public class IccUtils { private static int[] mapToNon2OrderBitColor(byte[] data, int valueIndex, int length, int[] colorArray, int bits) { if (0 == (8 % bits)) { - Log.e(LOG_TAG, "not odd number of color"); + Rlog.e(LOG_TAG, "not odd number of color"); return mapTo2OrderBitColor(data, valueIndex, length, colorArray, bits); } diff --git a/src/java/com/android/internal/telephony/MccTable.java b/src/java/com/android/internal/telephony/MccTable.java index cb3352126..7d5a4e7f9 100644 --- a/src/java/com/android/internal/telephony/MccTable.java +++ b/src/java/com/android/internal/telephony/MccTable.java @@ -26,7 +26,7 @@ import android.os.RemoteException; import android.os.SystemProperties; import android.telephony.TelephonyManager; import android.text.TextUtils; -import android.util.Log; +import android.telephony.Rlog; import java.util.ArrayList; import java.util.Collections; @@ -180,11 +180,11 @@ public final class MccTable mcc = Integer.parseInt(mccmnc.substring(0,3)); mnc = Integer.parseInt(mccmnc.substring(3)); } catch (NumberFormatException e) { - Log.e(LOG_TAG, "Error parsing IMSI"); + Rlog.e(LOG_TAG, "Error parsing IMSI"); return; } - Log.d(LOG_TAG, "updateMccMncConfiguration: mcc=" + mcc + ", mnc=" + mnc); + Rlog.d(LOG_TAG, "updateMccMncConfiguration: mcc=" + mcc + ", mnc=" + mnc); if (mcc != 0) { setTimezoneFromMccIfNeeded(context, mcc); @@ -201,7 +201,7 @@ public final class MccTable } ActivityManagerNative.getDefault().updateConfiguration(config); } catch (RemoteException e) { - Log.e(LOG_TAG, "Can't update configuration", e); + Rlog.e(LOG_TAG, "Can't update configuration", e); } } } @@ -273,7 +273,7 @@ public final class MccTable AlarmManager alarm = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); alarm.setTimeZone(zoneId); - Log.d(LOG_TAG, "timezone set to "+zoneId); + Rlog.d(LOG_TAG, "timezone set to "+zoneId); } } } @@ -292,7 +292,7 @@ public final class MccTable String language = MccTable.defaultLanguageForMcc(mcc); String country = MccTable.countryCodeForMcc(mcc); - Log.d(LOG_TAG, "locale set to "+language+"_"+country); + Rlog.d(LOG_TAG, "locale set to "+language+"_"+country); setSystemLocale(context, language, country); } @@ -305,7 +305,7 @@ public final class MccTable private static void setWifiCountryCodeFromMcc(Context context, int mcc) { String country = MccTable.countryCodeForMcc(mcc); if (!country.isEmpty()) { - Log.d(LOG_TAG, "WIFI_COUNTRY_CODE set to " + country); + Rlog.d(LOG_TAG, "WIFI_COUNTRY_CODE set to " + country); WifiManager wM = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); //persist wM.setCountryCode(country, true); diff --git a/src/java/com/android/internal/telephony/PhoneBase.java b/src/java/com/android/internal/telephony/PhoneBase.java index f617e2b61..e490d5bdb 100644 --- a/src/java/com/android/internal/telephony/PhoneBase.java +++ b/src/java/com/android/internal/telephony/PhoneBase.java @@ -36,7 +36,7 @@ import android.telephony.CellInfo; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.text.TextUtils; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.R; import com.android.internal.telephony.IccCardApplicationStatus.AppState; @@ -253,11 +253,11 @@ public abstract class PhoneBase extends Handler implements Phone { */ mDoesRilSendMultipleCallRing = SystemProperties.getBoolean( TelephonyProperties.PROPERTY_RIL_SENDS_MULTIPLE_CALL_RING, true); - Log.d(LOG_TAG, "mDoesRilSendMultipleCallRing=" + mDoesRilSendMultipleCallRing); + Rlog.d(LOG_TAG, "mDoesRilSendMultipleCallRing=" + mDoesRilSendMultipleCallRing); mCallRingDelay = SystemProperties.getInt( TelephonyProperties.PROPERTY_CALL_RING_DELAY, 3000); - Log.d(LOG_TAG, "mCallRingDelay=" + mCallRingDelay); + Rlog.d(LOG_TAG, "mCallRingDelay=" + mCallRingDelay); // Initialize device storage and outgoing SMS usage monitors for SMSDispatchers. mSmsStorageMonitor = new SmsStorageMonitor(this); @@ -302,7 +302,7 @@ public abstract class PhoneBase extends Handler implements Phone { switch(msg.what) { case EVENT_CALL_RING: - Log.d(LOG_TAG, "Event EVENT_CALL_RING Received state=" + getState()); + Rlog.d(LOG_TAG, "Event EVENT_CALL_RING Received state=" + getState()); ar = (AsyncResult)msg.obj; if (ar.exception == null) { PhoneConstants.State state = getState(); @@ -318,7 +318,7 @@ public abstract class PhoneBase extends Handler implements Phone { break; case EVENT_CALL_RING_CONTINUE: - Log.d(LOG_TAG, "Event EVENT_CALL_RING_CONTINUE Received stat=" + getState()); + Rlog.d(LOG_TAG, "Event EVENT_CALL_RING_CONTINUE Received stat=" + getState()); if (getState() == PhoneConstants.State.RINGING) { sendIncomingCallRingNotification(msg.arg1); } @@ -1118,12 +1118,12 @@ public abstract class PhoneBase extends Handler implements Phone { private void sendIncomingCallRingNotification(int token) { if (mIsVoiceCapable && !mDoesRilSendMultipleCallRing && (token == mCallRingContinueToken)) { - Log.d(LOG_TAG, "Sending notifyIncomingRing"); + Rlog.d(LOG_TAG, "Sending notifyIncomingRing"); notifyIncomingRing(); sendMessageDelayed( obtainMessage(EVENT_CALL_RING_CONTINUE, token, 0), mCallRingDelay); } else { - Log.d(LOG_TAG, "Ignoring ring notification request," + Rlog.d(LOG_TAG, "Ignoring ring notification request," + " mDoesRilSendMultipleCallRing=" + mDoesRilSendMultipleCallRing + " token=" + token + " mCallRingContinueToken=" + mCallRingContinueToken @@ -1139,12 +1139,12 @@ public abstract class PhoneBase extends Handler implements Phone { } public IsimRecords getIsimRecords() { - Log.e(LOG_TAG, "getIsimRecords() is only supported on LTE devices"); + Rlog.e(LOG_TAG, "getIsimRecords() is only supported on LTE devices"); return null; } public void requestIsimAuthentication(String nonce, Message result) { - Log.e(LOG_TAG, "requestIsimAuthentication() is only supported on LTE devices"); + Rlog.e(LOG_TAG, "requestIsimAuthentication() is only supported on LTE devices"); } public String getMsisdn() { @@ -1157,7 +1157,7 @@ public abstract class PhoneBase extends Handler implements Phone { */ private static void logUnexpectedCdmaMethodCall(String name) { - Log.e(LOG_TAG, "Error! " + name + "() in PhoneBase should not be " + + Rlog.e(LOG_TAG, "Error! " + name + "() in PhoneBase should not be " + "called, CDMAPhone inactive."); } @@ -1169,14 +1169,14 @@ public abstract class PhoneBase extends Handler implements Phone { * Common error logger method for unexpected calls to GSM/WCDMA-only methods. */ private static void logUnexpectedGsmMethodCall(String name) { - Log.e(LOG_TAG, "Error! " + name + "() in PhoneBase should not be " + + Rlog.e(LOG_TAG, "Error! " + name + "() in PhoneBase should not be " + "called, GSMPhone inactive."); } // Called by SimRecords which is constructed with a PhoneBase instead of a GSMPhone. public void notifyCallForwardingIndicator() { // This function should be overridden by the class GSMPhone. Not implemented in CDMAPhone. - Log.e(LOG_TAG, "Error! This function should never be executed, inactive CDMAPhone."); + Rlog.e(LOG_TAG, "Error! This function should never be executed, inactive CDMAPhone."); } public void notifyDataConnectionFailed(String reason, String apnType) { diff --git a/src/java/com/android/internal/telephony/PhoneFactory.java b/src/java/com/android/internal/telephony/PhoneFactory.java index 1892427b0..c0641d5b0 100644 --- a/src/java/com/android/internal/telephony/PhoneFactory.java +++ b/src/java/com/android/internal/telephony/PhoneFactory.java @@ -21,7 +21,7 @@ import android.net.LocalServerSocket; import android.os.Looper; import android.provider.Settings; import android.telephony.TelephonyManager; -import android.util.Log; +import android.telephony.Rlog; import android.os.SystemProperties; import com.android.internal.telephony.cdma.CDMAPhone; @@ -108,7 +108,7 @@ public class PhoneFactory { } int networkMode = Settings.Global.getInt(context.getContentResolver(), Settings.Global.PREFERRED_NETWORK_MODE, preferredNetworkMode); - Log.i(LOG_TAG, "Network Mode set to " + Integer.toString(networkMode)); + Rlog.i(LOG_TAG, "Network Mode set to " + Integer.toString(networkMode)); // Get cdmaSubscription // TODO: Change when the ril will provides a way to know at runtime @@ -119,11 +119,11 @@ public class PhoneFactory { switch (lteOnCdma) { case PhoneConstants.LTE_ON_CDMA_FALSE: cdmaSubscription = CdmaSubscriptionSourceManager.SUBSCRIPTION_FROM_NV; - Log.i(LOG_TAG, "lteOnCdma is 0 use SUBSCRIPTION_FROM_NV"); + Rlog.i(LOG_TAG, "lteOnCdma is 0 use SUBSCRIPTION_FROM_NV"); break; case PhoneConstants.LTE_ON_CDMA_TRUE: cdmaSubscription = CdmaSubscriptionSourceManager.SUBSCRIPTION_FROM_RUIM; - Log.i(LOG_TAG, "lteOnCdma is 1 use SUBSCRIPTION_FROM_RUIM"); + Rlog.i(LOG_TAG, "lteOnCdma is 1 use SUBSCRIPTION_FROM_RUIM"); break; case PhoneConstants.LTE_ON_CDMA_UNKNOWN: default: @@ -131,10 +131,10 @@ public class PhoneFactory { cdmaSubscription = Settings.Global.getInt(context.getContentResolver(), Settings.Global.PREFERRED_CDMA_SUBSCRIPTION, preferredCdmaSubscription); - Log.i(LOG_TAG, "lteOnCdma not set, using PREFERRED_CDMA_SUBSCRIPTION"); + Rlog.i(LOG_TAG, "lteOnCdma not set, using PREFERRED_CDMA_SUBSCRIPTION"); break; } - Log.i(LOG_TAG, "Cdma Subscription set to " + cdmaSubscription); + Rlog.i(LOG_TAG, "Cdma Subscription set to " + cdmaSubscription); //reads the system properties and makes commandsinterface sCommandsInterface = new RIL(context, networkMode, cdmaSubscription); @@ -144,19 +144,19 @@ public class PhoneFactory { int phoneType = TelephonyManager.getPhoneType(networkMode); if (phoneType == PhoneConstants.PHONE_TYPE_GSM) { - Log.i(LOG_TAG, "Creating GSMPhone"); + Rlog.i(LOG_TAG, "Creating GSMPhone"); sProxyPhone = new PhoneProxy(new GSMPhone(context, sCommandsInterface, sPhoneNotifier)); } else if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) { switch (TelephonyManager.getLteOnCdmaModeStatic()) { case PhoneConstants.LTE_ON_CDMA_TRUE: - Log.i(LOG_TAG, "Creating CDMALTEPhone"); + Rlog.i(LOG_TAG, "Creating CDMALTEPhone"); sProxyPhone = new PhoneProxy(new CDMALTEPhone(context, sCommandsInterface, sPhoneNotifier)); break; case PhoneConstants.LTE_ON_CDMA_FALSE: default: - Log.i(LOG_TAG, "Creating CDMAPhone"); + Rlog.i(LOG_TAG, "Creating CDMAPhone"); sProxyPhone = new PhoneProxy(new CDMAPhone(context, sCommandsInterface, sPhoneNotifier)); break; diff --git a/src/java/com/android/internal/telephony/PhoneProxy.java b/src/java/com/android/internal/telephony/PhoneProxy.java index 1c4bdc50a..75980fcac 100644 --- a/src/java/com/android/internal/telephony/PhoneProxy.java +++ b/src/java/com/android/internal/telephony/PhoneProxy.java @@ -31,7 +31,7 @@ import android.telephony.CellInfo; import android.telephony.CellLocation; import android.telephony.ServiceState; import android.telephony.SignalStrength; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.cdma.CDMAPhone; import com.android.internal.telephony.gsm.GSMPhone; @@ -131,15 +131,15 @@ public class PhoneProxy extends Handler implements Phone { } private static void logd(String msg) { - Log.d(LOG_TAG, "[PhoneProxy] " + msg); + Rlog.d(LOG_TAG, "[PhoneProxy] " + msg); } private void logw(String msg) { - Log.w(LOG_TAG, "[PhoneProxy] " + msg); + Rlog.w(LOG_TAG, "[PhoneProxy] " + msg); } private void loge(String msg) { - Log.e(LOG_TAG, "[PhoneProxy] " + msg); + Rlog.e(LOG_TAG, "[PhoneProxy] " + msg); } private void updatePhoneObject(int newVoiceRadioTech) { diff --git a/src/java/com/android/internal/telephony/PhoneStateIntentReceiver.java b/src/java/com/android/internal/telephony/PhoneStateIntentReceiver.java index 89084ac39..40f0c346f 100644 --- a/src/java/com/android/internal/telephony/PhoneStateIntentReceiver.java +++ b/src/java/com/android/internal/telephony/PhoneStateIntentReceiver.java @@ -25,7 +25,7 @@ import android.os.Message; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.TelephonyManager; -import android.util.Log; +import android.telephony.Rlog; /** * @@ -174,7 +174,7 @@ public final class PhoneStateIntentReceiver extends BroadcastReceiver { mTarget.sendMessage(message); } } else if (TelephonyManager.ACTION_PHONE_STATE_CHANGED.equals(action)) { - if (DBG) Log.d(LOG_TAG, "onReceiveIntent: ACTION_PHONE_STATE_CHANGED, state=" + if (DBG) Rlog.d(LOG_TAG, "onReceiveIntent: ACTION_PHONE_STATE_CHANGED, state=" + intent.getStringExtra(PhoneConstants.STATE_KEY)); String phoneState = intent.getStringExtra(PhoneConstants.STATE_KEY); mPhoneState = (PhoneConstants.State) Enum.valueOf( @@ -195,7 +195,7 @@ public final class PhoneStateIntentReceiver extends BroadcastReceiver { } } } catch (Exception ex) { - Log.e(LOG_TAG, "[PhoneStateIntentRecv] caught " + ex); + Rlog.e(LOG_TAG, "[PhoneStateIntentRecv] caught " + ex); ex.printStackTrace(); } } diff --git a/src/java/com/android/internal/telephony/PhoneSubInfo.java b/src/java/com/android/internal/telephony/PhoneSubInfo.java index e8449cefe..5a3e9b7c1 100755 --- a/src/java/com/android/internal/telephony/PhoneSubInfo.java +++ b/src/java/com/android/internal/telephony/PhoneSubInfo.java @@ -22,7 +22,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.Binder; import android.telephony.PhoneNumberUtils; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.ims.IsimRecords; @@ -50,9 +50,9 @@ public class PhoneSubInfo extends IPhoneSubInfo.Stub { try { super.finalize(); } catch (Throwable throwable) { - Log.e(LOG_TAG, "Error while finalizing:", throwable); + Rlog.e(LOG_TAG, "Error while finalizing:", throwable); } - Log.d(LOG_TAG, "PhoneSubInfo finalized"); + Rlog.d(LOG_TAG, "PhoneSubInfo finalized"); } /** @@ -118,7 +118,7 @@ public class PhoneSubInfo extends IPhoneSubInfo.Stub { public String getVoiceMailNumber() { mContext.enforceCallingOrSelfPermission(READ_PHONE_STATE, "Requires READ_PHONE_STATE"); String number = PhoneNumberUtils.extractNetworkPortion(mPhone.getVoiceMailNumber()); - Log.d(LOG_TAG, "VM: PhoneSubInfo.getVoiceMailNUmber: "); // + number); + Rlog.d(LOG_TAG, "VM: PhoneSubInfo.getVoiceMailNUmber: "); // + number); return number; } @@ -131,7 +131,7 @@ public class PhoneSubInfo extends IPhoneSubInfo.Stub { mContext.enforceCallingOrSelfPermission(CALL_PRIVILEGED, "Requires CALL_PRIVILEGED"); String number = mPhone.getVoiceMailNumber(); - Log.d(LOG_TAG, "VM: PhoneSubInfo.getCompleteVoiceMailNUmber: "); // + number); + Rlog.d(LOG_TAG, "VM: PhoneSubInfo.getCompleteVoiceMailNUmber: "); // + number); return number; } diff --git a/src/java/com/android/internal/telephony/RetryManager.java b/src/java/com/android/internal/telephony/RetryManager.java index 250d99eaa..7d9dc9c54 100644 --- a/src/java/com/android/internal/telephony/RetryManager.java +++ b/src/java/com/android/internal/telephony/RetryManager.java @@ -16,7 +16,7 @@ package com.android.internal.telephony; -import android.util.Log; +import android.telephony.Rlog; import android.util.Pair; import android.text.TextUtils; @@ -208,7 +208,7 @@ public class RetryManager { mMaxRetryCount = value.second; } } else { - Log.e(LOG_TAG, "Unrecognized configuration name value pair: " + Rlog.e(LOG_TAG, "Unrecognized configuration name value pair: " + strArray[i]); return false; } @@ -365,7 +365,7 @@ public class RetryManager { value = Integer.parseInt(stringValue); retVal = new Pair<Boolean, Integer>(validateNonNegativeInt(name, value), value); } catch (NumberFormatException e) { - Log.e(LOG_TAG, name + " bad value: " + stringValue, e); + Rlog.e(LOG_TAG, name + " bad value: " + stringValue, e); retVal = new Pair<Boolean, Integer>(false, 0); } if (VDBG) log("parseNonNetativeInt: " + name + ", " + stringValue + ", " @@ -383,7 +383,7 @@ public class RetryManager { private boolean validateNonNegativeInt(String name, int value) { boolean retVal; if (value < 0) { - Log.e(LOG_TAG, name + " bad value: is < 0"); + Rlog.e(LOG_TAG, name + " bad value: is < 0"); retVal = false; } else { retVal = true; @@ -405,6 +405,6 @@ public class RetryManager { } private void log(String s) { - Log.d(LOG_TAG, "[RM] " + s); + Rlog.d(LOG_TAG, "[RM] " + s); } } diff --git a/src/java/com/android/internal/telephony/SMSDispatcher.java b/src/java/com/android/internal/telephony/SMSDispatcher.java index 6740372a3..fedadc98b 100644 --- a/src/java/com/android/internal/telephony/SMSDispatcher.java +++ b/src/java/com/android/internal/telephony/SMSDispatcher.java @@ -51,7 +51,7 @@ import android.telephony.TelephonyManager; import android.text.Html; import android.text.Spanned; import android.util.EventLog; -import android.util.Log; +import android.telephony.Rlog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -225,7 +225,7 @@ public abstract class SMSDispatcher extends Handler { TelephonyProperties.PROPERTY_SMS_RECEIVE, mSmsCapable); mSmsSendDisabled = !SystemProperties.getBoolean( TelephonyProperties.PROPERTY_SMS_SEND, mSmsCapable); - Log.d(TAG, "SMSDispatcher: ctor mSmsCapable=" + mSmsCapable + " format=" + getFormat() + Rlog.d(TAG, "SMSDispatcher: ctor mSmsCapable=" + mSmsCapable + " format=" + getFormat() + " mSmsReceiveDisabled=" + mSmsReceiveDisabled + " mSmsSendDisabled=" + mSmsSendDisabled); } @@ -271,7 +271,7 @@ public abstract class SMSDispatcher extends Handler { @Override protected void finalize() { - Log.d(TAG, "SMSDispatcher finalized"); + Rlog.d(TAG, "SMSDispatcher finalized"); } @@ -296,7 +296,7 @@ public abstract class SMSDispatcher extends Handler { case EVENT_NEW_SMS: // A new SMS has been received by the device if (false) { - Log.d(TAG, "New SMS Message Received"); + Rlog.d(TAG, "New SMS Message Received"); } SmsMessage sms; @@ -304,7 +304,7 @@ public abstract class SMSDispatcher extends Handler { ar = (AsyncResult) msg.obj; if (ar.exception != null) { - Log.e(TAG, "Exception processing incoming SMS. Exception:" + ar.exception); + Rlog.e(TAG, "Exception processing incoming SMS. Exception:" + ar.exception); return; } @@ -318,7 +318,7 @@ public abstract class SMSDispatcher extends Handler { notifyAndAcknowledgeLastIncomingSms(handled, result, null); } } catch (RuntimeException ex) { - Log.e(TAG, "Exception dispatching message", ex); + Rlog.e(TAG, "Exception dispatching message", ex); notifyAndAcknowledgeLastIncomingSms(false, Intents.RESULT_SMS_GENERIC_ERROR, null); } @@ -364,7 +364,7 @@ public abstract class SMSDispatcher extends Handler { try { tracker.mSentIntent.send(RESULT_ERROR_LIMIT_EXCEEDED); } catch (CanceledException ex) { - Log.e(TAG, "failed to send RESULT_ERROR_LIMIT_EXCEEDED"); + Rlog.e(TAG, "failed to send RESULT_ERROR_LIMIT_EXCEEDED"); } } mPendingTrackerCount--; @@ -426,7 +426,7 @@ public abstract class SMSDispatcher extends Handler { if (ar.exception == null) { if (false) { - Log.d(TAG, "SMS send complete. Broadcasting " + Rlog.d(TAG, "SMS send complete. Broadcasting " + "intent: " + sentIntent); } @@ -454,7 +454,7 @@ public abstract class SMSDispatcher extends Handler { } } else { if (false) { - Log.d(TAG, "SMS send failed"); + Rlog.d(TAG, "SMS send failed"); } int ss = mPhone.getServiceState().getState(); @@ -609,12 +609,12 @@ public abstract class SMSDispatcher extends Handler { // moveToNext() returns false if no duplicates were found if (cursor.moveToNext()) { - Log.w(TAG, "Discarding duplicate message segment from address=" + address + Rlog.w(TAG, "Discarding duplicate message segment from address=" + address + " refNumber=" + refNumber + " seqNumber=" + seqNumber); String oldPduString = cursor.getString(PDU_COLUMN); byte[] oldPdu = HexDump.hexStringToByteArray(oldPduString); if (!Arrays.equals(oldPdu, pdu)) { - Log.e(TAG, "Warning: dup message segment PDU of length " + pdu.length + Rlog.e(TAG, "Warning: dup message segment PDU of length " + pdu.length + " is different from existing PDU of length " + oldPdu.length); } return Intents.RESULT_SMS_HANDLED; @@ -672,7 +672,7 @@ public abstract class SMSDispatcher extends Handler { // Remove the parts from the database mResolver.delete(mRawUri, where, whereArgs); } catch (SQLException e) { - Log.e(TAG, "Can't access multipart SMS database", e); + Rlog.e(TAG, "Can't access multipart SMS database", e); return Intents.RESULT_SMS_GENERIC_ERROR; } finally { if (cursor != null) cursor.close(); @@ -938,7 +938,7 @@ public abstract class SMSDispatcher extends Handler { sentIntent.send(RESULT_ERROR_NO_SERVICE); } catch (CanceledException ex) {} } - Log.d(TAG, "Device does not support sending sms."); + Rlog.d(TAG, "Device does not support sending sms."); return; } @@ -961,12 +961,12 @@ public abstract class SMSDispatcher extends Handler { if (packageNames == null || packageNames.length == 0) { // Refuse to send SMS if we can't get the calling package name. - Log.e(TAG, "Can't get calling app package name: refusing to send SMS"); + Rlog.e(TAG, "Can't get calling app package name: refusing to send SMS"); if (sentIntent != null) { try { sentIntent.send(RESULT_ERROR_GENERIC_FAILURE); } catch (CanceledException ex) { - Log.e(TAG, "failed to send error result"); + Rlog.e(TAG, "failed to send error result"); } } return; @@ -978,12 +978,12 @@ public abstract class SMSDispatcher extends Handler { // XXX this is lossy- apps can share a UID appInfo = pm.getPackageInfo(packageNames[0], PackageManager.GET_SIGNATURES); } catch (PackageManager.NameNotFoundException e) { - Log.e(TAG, "Can't get calling app package info: refusing to send SMS"); + Rlog.e(TAG, "Can't get calling app package info: refusing to send SMS"); if (sentIntent != null) { try { sentIntent.send(RESULT_ERROR_GENERIC_FAILURE); } catch (CanceledException ex) { - Log.e(TAG, "failed to send error result"); + Rlog.e(TAG, "failed to send error result"); } } return; @@ -1031,7 +1031,7 @@ public abstract class SMSDispatcher extends Handler { if (rule == PREMIUM_RULE_USE_SIM || rule == PREMIUM_RULE_USE_BOTH) { String simCountryIso = mTelephonyManager.getSimCountryIso(); if (simCountryIso == null || simCountryIso.length() != 2) { - Log.e(TAG, "Can't get SIM country Iso: trying network country Iso"); + Rlog.e(TAG, "Can't get SIM country Iso: trying network country Iso"); simCountryIso = mTelephonyManager.getNetworkCountryIso(); } @@ -1040,7 +1040,7 @@ public abstract class SMSDispatcher extends Handler { if (rule == PREMIUM_RULE_USE_NETWORK || rule == PREMIUM_RULE_USE_BOTH) { String networkCountryIso = mTelephonyManager.getNetworkCountryIso(); if (networkCountryIso == null || networkCountryIso.length() != 2) { - Log.e(TAG, "Can't get Network country Iso: trying SIM country Iso"); + Rlog.e(TAG, "Can't get Network country Iso: trying SIM country Iso"); networkCountryIso = mTelephonyManager.getSimCountryIso(); } @@ -1064,11 +1064,11 @@ public abstract class SMSDispatcher extends Handler { switch (premiumSmsPermission) { case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW: - Log.d(TAG, "User approved this app to send to premium SMS"); + Rlog.d(TAG, "User approved this app to send to premium SMS"); return true; case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_NEVER_ALLOW: - Log.w(TAG, "User denied this app from sending to premium SMS"); + Rlog.w(TAG, "User denied this app from sending to premium SMS"); sendMessage(obtainMessage(EVENT_STOP_SENDING, tracker)); return false; // reject this message @@ -1098,7 +1098,7 @@ public abstract class SMSDispatcher extends Handler { try { tracker.mSentIntent.send(RESULT_ERROR_LIMIT_EXCEEDED); } catch (CanceledException ex) { - Log.e(TAG, "failed to send back RESULT_ERROR_LIMIT_EXCEEDED"); + Rlog.e(TAG, "failed to send back RESULT_ERROR_LIMIT_EXCEEDED"); } return true; } @@ -1117,7 +1117,7 @@ public abstract class SMSDispatcher extends Handler { ApplicationInfo appInfo = pm.getApplicationInfo(appPackage, 0); return appInfo.loadLabel(pm); } catch (PackageManager.NameNotFoundException e) { - Log.e(TAG, "PackageManager Name Not Found for package " + appPackage); + Rlog.e(TAG, "PackageManager Name Not Found for package " + appPackage); return appPackage; // fall back to package name if we can't get app label } } @@ -1373,7 +1373,7 @@ public abstract class SMSDispatcher extends Handler { int newSmsPermission = SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ASK_USER; if (which == DialogInterface.BUTTON_POSITIVE) { - Log.d(TAG, "CONFIRM sending SMS"); + Rlog.d(TAG, "CONFIRM sending SMS"); // XXX this is lossy- apps can have more than one signature EventLog.writeEvent(EventLogTags.SMS_SENT_BY_USER, mTracker.mAppInfo.signatures[0].toCharsString()); @@ -1382,7 +1382,7 @@ public abstract class SMSDispatcher extends Handler { newSmsPermission = SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW; } } else if (which == DialogInterface.BUTTON_NEGATIVE) { - Log.d(TAG, "DENY sending SMS"); + Rlog.d(TAG, "DENY sending SMS"); // XXX this is lossy- apps can have more than one signature EventLog.writeEvent(EventLogTags.SMS_DENIED_BY_USER, mTracker.mAppInfo.signatures[0].toCharsString()); @@ -1396,13 +1396,13 @@ public abstract class SMSDispatcher extends Handler { @Override public void onCancel(DialogInterface dialog) { - Log.d(TAG, "dialog dismissed: don't send SMS"); + Rlog.d(TAG, "dialog dismissed: don't send SMS"); sendMessage(obtainMessage(EVENT_STOP_SENDING, mTracker)); } @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - Log.d(TAG, "remember this choice: " + isChecked); + Rlog.d(TAG, "remember this choice: " + isChecked); mRememberChoice = isChecked; if (isChecked) { mPositiveButton.setText(R.string.sms_short_code_confirm_always_allow); @@ -1442,12 +1442,12 @@ public abstract class SMSDispatcher extends Handler { if (message.isEmergencyMessage()) { Intent intent = new Intent(Intents.SMS_EMERGENCY_CB_RECEIVED_ACTION); intent.putExtra("message", message); - Log.d(TAG, "Dispatching emergency SMS CB"); + Rlog.d(TAG, "Dispatching emergency SMS CB"); dispatch(intent, RECEIVE_EMERGENCY_BROADCAST_PERMISSION); } else { Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION); intent.putExtra("message", message); - Log.d(TAG, "Dispatching SMS CB"); + Rlog.d(TAG, "Dispatching SMS CB"); dispatch(intent, RECEIVE_SMS_PERMISSION); } } diff --git a/src/java/com/android/internal/telephony/SmsStorageMonitor.java b/src/java/com/android/internal/telephony/SmsStorageMonitor.java index 0c06ffc87..6a9283fdf 100644 --- a/src/java/com/android/internal/telephony/SmsStorageMonitor.java +++ b/src/java/com/android/internal/telephony/SmsStorageMonitor.java @@ -25,7 +25,7 @@ import android.os.Handler; import android.os.Message; import android.os.PowerManager; import android.provider.Telephony.Sms.Intents; -import android.util.Log; +import android.telephony.Rlog; /** * Monitors the device and ICC storage, and sends the appropriate events. @@ -107,7 +107,7 @@ public final class SmsStorageMonitor extends Handler { ar = (AsyncResult) msg.obj; if (ar.exception != null) { mReportMemoryStatusPending = true; - Log.v(TAG, "Memory status report to modem pending : mStorageAvailable = " + Rlog.v(TAG, "Memory status report to modem pending : mStorageAvailable = " + mStorageAvailable); } else { mReportMemoryStatusPending = false; @@ -116,7 +116,7 @@ public final class SmsStorageMonitor extends Handler { case EVENT_RADIO_ON: if (mReportMemoryStatusPending) { - Log.v(TAG, "Sending pending memory status report : mStorageAvailable = " + Rlog.v(TAG, "Sending pending memory status report : mStorageAvailable = " + mStorageAvailable); mCm.reportSmsMemoryStatus(mStorageAvailable, obtainMessage(EVENT_REPORT_MEMORY_STATUS_DONE)); diff --git a/src/java/com/android/internal/telephony/SmsUsageMonitor.java b/src/java/com/android/internal/telephony/SmsUsageMonitor.java index 00328815a..98155fd90 100644 --- a/src/java/com/android/internal/telephony/SmsUsageMonitor.java +++ b/src/java/com/android/internal/telephony/SmsUsageMonitor.java @@ -31,7 +31,7 @@ import android.os.UserHandle; import android.provider.Settings; import android.telephony.PhoneNumberUtils; import android.util.AtomicFile; -import android.util.Log; +import android.telephony.Rlog; import android.util.Xml; import com.android.internal.util.FastXmlSerializer; @@ -290,9 +290,9 @@ public class SmsUsageMonitor { parser.setInput(patternReader); return getPatternMatcherFromXmlParser(parser, country); } catch (FileNotFoundException e) { - Log.e(TAG, "Short Code Pattern File not found"); + Rlog.e(TAG, "Short Code Pattern File not found"); } catch (XmlPullParserException e) { - Log.e(TAG, "XML parser exception reading short code pattern file", e); + Rlog.e(TAG, "XML parser exception reading short code pattern file", e); } finally { mPatternFileLastModified = mPatternFile.lastModified(); if (patternReader != null) { @@ -324,13 +324,13 @@ public class SmsUsageMonitor { XmlUtils.nextElement(parser); String element = parser.getName(); if (element == null) { - Log.e(TAG, "Parsing pattern data found null"); + Rlog.e(TAG, "Parsing pattern data found null"); break; } if (element.equals(TAG_SHORTCODE)) { String currentCountry = parser.getAttributeValue(null, ATTR_COUNTRY); - if (VDBG) Log.d(TAG, "Found country " + currentCountry); + if (VDBG) Rlog.d(TAG, "Found country " + currentCountry); if (country.equals(currentCountry)) { String pattern = parser.getAttributeValue(null, ATTR_PATTERN); String premium = parser.getAttributeValue(null, ATTR_PREMIUM); @@ -339,15 +339,15 @@ public class SmsUsageMonitor { return new ShortCodePatternMatcher(pattern, premium, free, standard); } } else { - Log.e(TAG, "Error: skipping unknown XML tag " + element); + Rlog.e(TAG, "Error: skipping unknown XML tag " + element); } } } catch (XmlPullParserException e) { - Log.e(TAG, "XML parser exception reading short code patterns", e); + Rlog.e(TAG, "XML parser exception reading short code patterns", e); } catch (IOException e) { - Log.e(TAG, "I/O exception reading short code patterns", e); + Rlog.e(TAG, "I/O exception reading short code patterns", e); } - if (DBG) Log.d(TAG, "Country (" + country + ") not found"); + if (DBG) Rlog.d(TAG, "Country (" + country + ") not found"); return null; // country not found } @@ -398,12 +398,12 @@ public class SmsUsageMonitor { synchronized (mSettingsObserverHandler) { // always allow emergency numbers if (PhoneNumberUtils.isEmergencyNumber(destAddress, countryIso)) { - if (DBG) Log.d(TAG, "isEmergencyNumber"); + if (DBG) Rlog.d(TAG, "isEmergencyNumber"); return CATEGORY_NOT_SHORT_CODE; } // always allow if the feature is disabled if (!mCheckEnabled.get()) { - if (DBG) Log.e(TAG, "check disabled"); + if (DBG) Rlog.e(TAG, "check disabled"); return CATEGORY_NOT_SHORT_CODE; } @@ -411,10 +411,10 @@ public class SmsUsageMonitor { if (mCurrentCountry == null || !countryIso.equals(mCurrentCountry) || mPatternFile.lastModified() != mPatternFileLastModified) { if (mPatternFile.exists()) { - if (DBG) Log.d(TAG, "Loading SMS Short Code patterns from file"); + if (DBG) Rlog.d(TAG, "Loading SMS Short Code patterns from file"); mCurrentPatternMatcher = getPatternMatcherFromFile(countryIso); } else { - if (DBG) Log.d(TAG, "Loading SMS Short Code patterns from resource"); + if (DBG) Rlog.d(TAG, "Loading SMS Short Code patterns from resource"); mCurrentPatternMatcher = getPatternMatcherFromResource(countryIso); } mCurrentCountry = countryIso; @@ -425,7 +425,7 @@ public class SmsUsageMonitor { return mCurrentPatternMatcher.getNumberCategory(destAddress); } else { // Generic rule: numbers of 5 digits or less are considered potential short codes - Log.e(TAG, "No patterns for \"" + countryIso + "\": using generic short code rule"); + Rlog.e(TAG, "No patterns for \"" + countryIso + "\": using generic short code rule"); if (destAddress.length() <= 5) { return CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE; } else { @@ -465,26 +465,26 @@ public class SmsUsageMonitor { String packageName = parser.getAttributeValue(null, ATTR_PACKAGE_NAME); String policy = parser.getAttributeValue(null, ATTR_PACKAGE_SMS_POLICY); if (packageName == null) { - Log.e(TAG, "Error: missing package name attribute"); + Rlog.e(TAG, "Error: missing package name attribute"); } else if (policy == null) { - Log.e(TAG, "Error: missing package policy attribute"); + Rlog.e(TAG, "Error: missing package policy attribute"); } else try { mPremiumSmsPolicy.put(packageName, Integer.parseInt(policy)); } catch (NumberFormatException e) { - Log.e(TAG, "Error: non-numeric policy type " + policy); + Rlog.e(TAG, "Error: non-numeric policy type " + policy); } } else { - Log.e(TAG, "Error: skipping unknown XML tag " + element); + Rlog.e(TAG, "Error: skipping unknown XML tag " + element); } } } catch (FileNotFoundException e) { // No data yet } catch (IOException e) { - Log.e(TAG, "Unable to read premium SMS policy database", e); + Rlog.e(TAG, "Unable to read premium SMS policy database", e); } catch (NumberFormatException e) { - Log.e(TAG, "Unable to parse premium SMS policy database", e); + Rlog.e(TAG, "Unable to parse premium SMS policy database", e); } catch (XmlPullParserException e) { - Log.e(TAG, "Unable to parse premium SMS policy database", e); + Rlog.e(TAG, "Unable to parse premium SMS policy database", e); } finally { if (infile != null) { try { @@ -526,7 +526,7 @@ public class SmsUsageMonitor { mPolicyFile.finishWrite(outfile); } catch (IOException e) { - Log.e(TAG, "Unable to write premium SMS policy database", e); + Rlog.e(TAG, "Unable to write premium SMS policy database", e); if (outfile != null) { mPolicyFile.failWrite(outfile); } @@ -649,6 +649,6 @@ public class SmsUsageMonitor { } private static void log(String msg) { - Log.d(TAG, msg); + Rlog.d(TAG, msg); } } diff --git a/src/java/com/android/internal/telephony/TelephonyCapabilities.java b/src/java/com/android/internal/telephony/TelephonyCapabilities.java index a9e9376e4..f374f4120 100644 --- a/src/java/com/android/internal/telephony/TelephonyCapabilities.java +++ b/src/java/com/android/internal/telephony/TelephonyCapabilities.java @@ -16,7 +16,7 @@ package com.android.internal.telephony; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.Phone; @@ -104,7 +104,7 @@ public class TelephonyCapabilities { } else if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) { return com.android.internal.R.string.meid; } else { - Log.w(LOG_TAG, "getDeviceIdLabel: no known label for phone " + Rlog.w(LOG_TAG, "getDeviceIdLabel: no known label for phone " + phone.getPhoneName()); return 0; } diff --git a/src/java/com/android/internal/telephony/UiccCard.java b/src/java/com/android/internal/telephony/UiccCard.java index 038a138b7..6c4199f6b 100644 --- a/src/java/com/android/internal/telephony/UiccCard.java +++ b/src/java/com/android/internal/telephony/UiccCard.java @@ -29,7 +29,7 @@ import android.os.Message; import android.os.PowerManager; import android.os.Registrant; import android.os.RegistrantList; -import android.util.Log; +import android.telephony.Rlog; import android.view.WindowManager; import com.android.internal.telephony.PhoneBase; @@ -349,10 +349,10 @@ public class UiccCard { } private void log(String msg) { - Log.d(LOG_TAG, msg); + Rlog.d(LOG_TAG, msg); } private void loge(String msg) { - Log.e(LOG_TAG, msg); + Rlog.e(LOG_TAG, msg); } } diff --git a/src/java/com/android/internal/telephony/UiccCardApplication.java b/src/java/com/android/internal/telephony/UiccCardApplication.java index 2718af6e4..5edddc560 100644 --- a/src/java/com/android/internal/telephony/UiccCardApplication.java +++ b/src/java/com/android/internal/telephony/UiccCardApplication.java @@ -22,7 +22,7 @@ import android.os.Handler; import android.os.Message; import android.os.Registrant; import android.os.RegistrantList; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.IccCardApplicationStatus.AppState; import com.android.internal.telephony.IccCardApplicationStatus.AppType; @@ -690,10 +690,10 @@ public class UiccCardApplication { } private void log(String msg) { - Log.d(LOG_TAG, msg); + Rlog.d(LOG_TAG, msg); } private void loge(String msg) { - Log.e(LOG_TAG, msg); + Rlog.e(LOG_TAG, msg); } } diff --git a/src/java/com/android/internal/telephony/UsimFileHandler.java b/src/java/com/android/internal/telephony/UsimFileHandler.java index 5ef0333d0..d41844de4 100644 --- a/src/java/com/android/internal/telephony/UsimFileHandler.java +++ b/src/java/com/android/internal/telephony/UsimFileHandler.java @@ -16,7 +16,7 @@ package com.android.internal.telephony; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.IccConstants; @@ -77,11 +77,11 @@ public final class UsimFileHandler extends IccFileHandler implements IccConstant @Override protected void logd(String msg) { - Log.d(LOG_TAG, msg); + Rlog.d(LOG_TAG, msg); } @Override protected void loge(String msg) { - Log.e(LOG_TAG, msg); + Rlog.e(LOG_TAG, msg); } } diff --git a/src/java/com/android/internal/telephony/WapPushOverSms.java b/src/java/com/android/internal/telephony/WapPushOverSms.java index e2779dc13..b04164b79 100755 --- a/src/java/com/android/internal/telephony/WapPushOverSms.java +++ b/src/java/com/android/internal/telephony/WapPushOverSms.java @@ -24,7 +24,7 @@ import android.content.Intent; import android.content.ServiceConnection; import android.provider.Telephony; import android.provider.Telephony.Sms.Intents; -import android.util.Log; +import android.telephony.Rlog; import android.os.IBinder; import android.os.RemoteException; @@ -61,13 +61,13 @@ public class WapPushOverSms { public void onServiceConnected(ComponentName name, IBinder service) { mWapPushMan = IWapPushManager.Stub.asInterface(service); - if (false) Log.v(LOG_TAG, "wappush manager connected to " + + if (false) Rlog.v(LOG_TAG, "wappush manager connected to " + mOwner.hashCode()); } public void onServiceDisconnected(ComponentName name) { mWapPushMan = null; - if (false) Log.v(LOG_TAG, "wappush manager disconnected."); + if (false) Rlog.v(LOG_TAG, "wappush manager disconnected."); // WapPushManager must be always attached. rebindWapPushManager(); } @@ -100,7 +100,7 @@ public class WapPushOverSms { try { Thread.sleep(BIND_RETRY_INTERVAL); } catch (InterruptedException e) { - if (false) Log.v(LOG_TAG, "sleep interrupted."); + if (false) Rlog.v(LOG_TAG, "sleep interrupted."); } } } @@ -134,7 +134,7 @@ public class WapPushOverSms { */ public int dispatchWapPdu(byte[] pdu) { - if (false) Log.d(LOG_TAG, "Rx: " + IccUtils.bytesToHexString(pdu)); + if (false) Rlog.d(LOG_TAG, "Rx: " + IccUtils.bytesToHexString(pdu)); int index = 0; int transactionId = pdu[index++] & 0xFF; @@ -143,7 +143,7 @@ public class WapPushOverSms { if ((pduType != WspTypeDecoder.PDU_TYPE_PUSH) && (pduType != WspTypeDecoder.PDU_TYPE_CONFIRMED_PUSH)) { - if (false) Log.w(LOG_TAG, "Received non-PUSH WAP PDU. Type = " + pduType); + if (false) Rlog.w(LOG_TAG, "Received non-PUSH WAP PDU. Type = " + pduType); return Intents.RESULT_SMS_HANDLED; } @@ -156,7 +156,7 @@ public class WapPushOverSms { * So it will be encoded in no more than 5 octets. */ if (pduDecoder.decodeUintvarInteger(index) == false) { - if (false) Log.w(LOG_TAG, "Received PDU. Header Length error."); + if (false) Rlog.w(LOG_TAG, "Received PDU. Header Length error."); return Intents.RESULT_SMS_GENERIC_ERROR; } headerLength = (int)pduDecoder.getValue32(); @@ -177,7 +177,7 @@ public class WapPushOverSms { * Length = Uintvar-integer */ if (pduDecoder.decodeContentType(index) == false) { - if (false) Log.w(LOG_TAG, "Received PDU. Header Content-Type error."); + if (false) Rlog.w(LOG_TAG, "Received PDU. Header Content-Type error."); return Intents.RESULT_SMS_GENERIC_ERROR; } @@ -214,14 +214,14 @@ public class WapPushOverSms { String contentType = ((mimeType == null) ? Long.toString(binaryContentType) : mimeType); - if (false) Log.v(LOG_TAG, "appid found: " + wapAppId + ":" + contentType); + if (false) Rlog.v(LOG_TAG, "appid found: " + wapAppId + ":" + contentType); try { boolean processFurther = true; IWapPushManager wapPushMan = mWapConn.getWapPushManager(); if (wapPushMan == null) { - if (false) Log.w(LOG_TAG, "wap push manager not found!"); + if (false) Rlog.w(LOG_TAG, "wap push manager not found!"); } else { Intent intent = new Intent(); intent.putExtra("transactionId", transactionId); @@ -232,7 +232,7 @@ public class WapPushOverSms { pduDecoder.getContentParameters()); int procRet = wapPushMan.processMessage(wapAppId, contentType, intent); - if (false) Log.v(LOG_TAG, "procRet:" + procRet); + if (false) Rlog.v(LOG_TAG, "procRet:" + procRet); if ((procRet & WapPushManagerParams.MESSAGE_HANDLED) > 0 && (procRet & WapPushManagerParams.FURTHER_PROCESSING) == 0) { processFurther = false; @@ -242,13 +242,13 @@ public class WapPushOverSms { return Intents.RESULT_SMS_HANDLED; } } catch (RemoteException e) { - if (false) Log.w(LOG_TAG, "remote func failed..."); + if (false) Rlog.w(LOG_TAG, "remote func failed..."); } } - if (false) Log.v(LOG_TAG, "fall back to existing handler"); + if (false) Rlog.v(LOG_TAG, "fall back to existing handler"); if (mimeType == null) { - if (false) Log.w(LOG_TAG, "Header Content-Type error."); + if (false) Rlog.w(LOG_TAG, "Header Content-Type error."); return Intents.RESULT_SMS_GENERIC_ERROR; } diff --git a/src/java/com/android/internal/telephony/cat/CatLog.java b/src/java/com/android/internal/telephony/cat/CatLog.java index e19ff435b..b2e641c82 100644 --- a/src/java/com/android/internal/telephony/cat/CatLog.java +++ b/src/java/com/android/internal/telephony/cat/CatLog.java @@ -16,7 +16,7 @@ package com.android.internal.telephony.cat; -import android.util.Log; +import android.telephony.Rlog; public abstract class CatLog { static final boolean DEBUG = true; @@ -27,7 +27,7 @@ public abstract class CatLog { } String className = caller.getClass().getName(); - Log.d("CAT", className.substring(className.lastIndexOf('.') + 1) + ": " + Rlog.d("CAT", className.substring(className.lastIndexOf('.') + 1) + ": " + msg); } @@ -36,6 +36,6 @@ public abstract class CatLog { return; } - Log.d("CAT", caller + ": " + msg); + Rlog.d("CAT", caller + ": " + msg); } } diff --git a/src/java/com/android/internal/telephony/cat/ComprehensionTlv.java b/src/java/com/android/internal/telephony/cat/ComprehensionTlv.java index 22cd5a4cf..e2522a4fb 100644 --- a/src/java/com/android/internal/telephony/cat/ComprehensionTlv.java +++ b/src/java/com/android/internal/telephony/cat/ComprehensionTlv.java @@ -16,7 +16,7 @@ package com.android.internal.telephony.cat; -import android.util.Log; +import android.telephony.Rlog; import java.util.ArrayList; import java.util.List; @@ -125,7 +125,7 @@ class ComprehensionTlv { case 0: case 0xff: case 0x80: - Log.d("CAT ", "decode: unexpected first tag byte=" + Integer.toHexString(temp) + + Rlog.d("CAT ", "decode: unexpected first tag byte=" + Integer.toHexString(temp) + ", startIndex=" + startIndex + " curIndex=" + curIndex + " endIndex=" + endIndex); // Return null which will stop decoding, this has occurred diff --git a/src/java/com/android/internal/telephony/cat/IconLoader.java b/src/java/com/android/internal/telephony/cat/IconLoader.java index 2fa18119c..880815240 100644 --- a/src/java/com/android/internal/telephony/cat/IconLoader.java +++ b/src/java/com/android/internal/telephony/cat/IconLoader.java @@ -25,7 +25,7 @@ import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import java.util.HashMap; diff --git a/src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java b/src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java index cc59b672b..fc4d35634 100644 --- a/src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java +++ b/src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java @@ -25,7 +25,7 @@ import android.os.AsyncResult; import android.os.Message; import android.preference.PreferenceManager; import android.provider.Telephony; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.OperatorInfo; @@ -177,7 +177,7 @@ public class CDMALTEPhone extends CDMAPhone { // look for our wrapper within the asyncresult, skip the rest if it // is null. if (!(ar.userObj instanceof NetworkSelectMessage)) { - Log.e(LOG_TAG, "unexpected result from user object."); + Rlog.e(LOG_TAG, "unexpected result from user object."); return; } @@ -200,7 +200,7 @@ public class CDMALTEPhone extends CDMAPhone { // commit and log the result. if (! editor.commit()) { - Log.e(LOG_TAG, "failed to commit network selection preference"); + Rlog.e(LOG_TAG, "failed to commit network selection preference"); } } @@ -218,7 +218,7 @@ public class CDMALTEPhone extends CDMAPhone { mContext.getContentResolver().insert(uri, map); return true; } catch (SQLException e) { - Log.e(LOG_TAG, "[CDMALTEPhone] Can't store current operator ret false", e); + Rlog.e(LOG_TAG, "[CDMALTEPhone] Can't store current operator ret false", e); } } else { if (DBG) log("updateCurrentCarrierInProvider mIccRecords == null ret false"); @@ -302,7 +302,7 @@ public class CDMALTEPhone extends CDMAPhone { @Override protected void log(String s) { - Log.d(LOG_TAG, "[CDMALTEPhone] " + s); + Rlog.d(LOG_TAG, "[CDMALTEPhone] " + s); } @Override diff --git a/src/java/com/android/internal/telephony/cdma/CDMAPhone.java b/src/java/com/android/internal/telephony/cdma/CDMAPhone.java index 471be80c1..838686133 100755 --- a/src/java/com/android/internal/telephony/cdma/CDMAPhone.java +++ b/src/java/com/android/internal/telephony/cdma/CDMAPhone.java @@ -39,7 +39,7 @@ import android.telephony.PhoneNumberUtils; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.text.TextUtils; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.Call; import com.android.internal.telephony.CallStateException; @@ -266,9 +266,9 @@ public class CDMAPhone extends PhoneBase { @Override protected void finalize() { - if(DBG) Log.d(LOG_TAG, "CDMAPhone finalized"); + if(DBG) Rlog.d(LOG_TAG, "CDMAPhone finalized"); if (mWakeLock.isHeld()) { - Log.e(LOG_TAG, "UNEXPECTED; mWakeLock is held when finalizing."); + Rlog.e(LOG_TAG, "UNEXPECTED; mWakeLock is held when finalizing."); mWakeLock.release(); } } @@ -298,7 +298,7 @@ public class CDMAPhone extends PhoneBase { } public boolean canTransfer() { - Log.e(LOG_TAG, "canTransfer: not possible in CDMA"); + Rlog.e(LOG_TAG, "canTransfer: not possible in CDMA"); return false; } @@ -316,7 +316,7 @@ public class CDMAPhone extends PhoneBase { public void conference() throws CallStateException { // three way calls in CDMA will be handled by feature codes - Log.e(LOG_TAG, "conference: not possible in CDMA"); + Rlog.e(LOG_TAG, "conference: not possible in CDMA"); } public void enableEnhancedVoicePrivacy(boolean enable, Message onComplete) { @@ -380,7 +380,7 @@ public class CDMAPhone extends PhoneBase { public void registerForSuppServiceNotification( Handler h, int what, Object obj) { - Log.e(LOG_TAG, "method registerForSuppServiceNotification is NOT supported in CDMA!"); + Rlog.e(LOG_TAG, "method registerForSuppServiceNotification is NOT supported in CDMA!"); } public CdmaCall getBackgroundCall() { @@ -388,7 +388,7 @@ public class CDMAPhone extends PhoneBase { } public boolean handleInCallMmiCommands(String dialString) { - Log.e(LOG_TAG, "method handleInCallMmiCommands is NOT supported in CDMA!"); + Rlog.e(LOG_TAG, "method handleInCallMmiCommands is NOT supported in CDMA!"); return false; } @@ -403,11 +403,11 @@ public class CDMAPhone extends PhoneBase { public void setNetworkSelectionModeAutomatic(Message response) { - Log.e(LOG_TAG, "method setNetworkSelectionModeAutomatic is NOT supported in CDMA!"); + Rlog.e(LOG_TAG, "method setNetworkSelectionModeAutomatic is NOT supported in CDMA!"); } public void unregisterForSuppServiceNotification(Handler h) { - Log.e(LOG_TAG, "method unregisterForSuppServiceNotification is NOT supported in CDMA!"); + Rlog.e(LOG_TAG, "method unregisterForSuppServiceNotification is NOT supported in CDMA!"); } public void @@ -462,14 +462,14 @@ public class CDMAPhone extends PhoneBase { public String getDeviceId() { String id = getMeid(); if ((id == null) || id.matches("^0*$")) { - Log.d(LOG_TAG, "getDeviceId(): MEID is not initialized use ESN"); + Rlog.d(LOG_TAG, "getDeviceId(): MEID is not initialized use ESN"); id = getEsn(); } return id; } public String getDeviceSvn() { - Log.d(LOG_TAG, "getDeviceSvn(): return 0"); + Rlog.d(LOG_TAG, "getDeviceSvn(): return 0"); return "0"; } @@ -478,12 +478,12 @@ public class CDMAPhone extends PhoneBase { } public String getImei() { - Log.e(LOG_TAG, "IMEI is not available in CDMA"); + Rlog.e(LOG_TAG, "IMEI is not available in CDMA"); return null; } public boolean canConference() { - Log.e(LOG_TAG, "canConference: not possible in CDMA"); + Rlog.e(LOG_TAG, "canConference: not possible in CDMA"); return false; } @@ -498,7 +498,7 @@ public class CDMAPhone extends PhoneBase { public void selectNetworkManually(OperatorInfo network, Message response) { - Log.e(LOG_TAG, "selectNetworkManually: not possible in CDMA"); + Rlog.e(LOG_TAG, "selectNetworkManually: not possible in CDMA"); } public void setOnPostDialCharacter(Handler h, int what, Object obj) { @@ -509,7 +509,7 @@ public class CDMAPhone extends PhoneBase { CdmaMmiCode mmi = CdmaMmiCode.newFromDialString(dialString, this); if (mmi == null) { - Log.e(LOG_TAG, "Mmi is NULL!"); + Rlog.e(LOG_TAG, "Mmi is NULL!"); return false; } else if (mmi.isPukCommand()) { mPendingMmis.add(mmi); @@ -517,7 +517,7 @@ public class CDMAPhone extends PhoneBase { mmi.processCode(); return true; } - Log.e(LOG_TAG, "Unrecognized mmi!"); + Rlog.e(LOG_TAG, "Unrecognized mmi!"); return false; } @@ -538,11 +538,11 @@ public class CDMAPhone extends PhoneBase { } public void setLine1Number(String alphaTag, String number, Message onComplete) { - Log.e(LOG_TAG, "setLine1Number: not possible in CDMA"); + Rlog.e(LOG_TAG, "setLine1Number: not possible in CDMA"); } public void setCallWaiting(boolean enable, Message onComplete) { - Log.e(LOG_TAG, "method setCallWaiting is NOT supported in CDMA!"); + Rlog.e(LOG_TAG, "method setCallWaiting is NOT supported in CDMA!"); } public void updateServiceLocation() { @@ -648,12 +648,12 @@ public class CDMAPhone extends PhoneBase { } public void sendUssdResponse(String ussdMessge) { - Log.e(LOG_TAG, "sendUssdResponse: not possible in CDMA"); + Rlog.e(LOG_TAG, "sendUssdResponse: not possible in CDMA"); } public void sendDtmf(char c) { if (!PhoneNumberUtils.is12Key(c)) { - Log.e(LOG_TAG, + Rlog.e(LOG_TAG, "sendDtmf called with invalid character '" + c + "'"); } else { if (mCT.state == PhoneConstants.State.OFFHOOK) { @@ -664,7 +664,7 @@ public class CDMAPhone extends PhoneBase { public void startDtmf(char c) { if (!PhoneNumberUtils.is12Key(c)) { - Log.e(LOG_TAG, + Rlog.e(LOG_TAG, "startDtmf called with invalid character '" + c + "'"); } else { mCM.startDtmf(c, null); @@ -679,7 +679,7 @@ public class CDMAPhone extends PhoneBase { boolean check = true; for (int itr = 0;itr < dtmfString.length(); itr++) { if (!PhoneNumberUtils.is12Key(dtmfString.charAt(itr))) { - Log.e(LOG_TAG, + Rlog.e(LOG_TAG, "sendDtmf called with invalid character '" + dtmfString.charAt(itr)+ "'"); check = false; break; @@ -691,11 +691,11 @@ public class CDMAPhone extends PhoneBase { } public void getAvailableNetworks(Message response) { - Log.e(LOG_TAG, "getAvailableNetworks: not possible in CDMA"); + Rlog.e(LOG_TAG, "getAvailableNetworks: not possible in CDMA"); } public void setOutgoingCallerIdDisplay(int commandInterfaceCLIRMode, Message onComplete) { - Log.e(LOG_TAG, "setOutgoingCallerIdDisplay: not possible in CDMA"); + Rlog.e(LOG_TAG, "setOutgoingCallerIdDisplay: not possible in CDMA"); } public void enableLocationUpdates() { @@ -772,7 +772,7 @@ public class CDMAPhone extends PhoneBase { } public void getCallForwardingOption(int commandInterfaceCFReason, Message onComplete) { - Log.e(LOG_TAG, "getCallForwardingOption: not possible in CDMA"); + Rlog.e(LOG_TAG, "getCallForwardingOption: not possible in CDMA"); } public void setCallForwardingOption(int commandInterfaceCFAction, @@ -780,26 +780,26 @@ public class CDMAPhone extends PhoneBase { String dialingNumber, int timerSeconds, Message onComplete) { - Log.e(LOG_TAG, "setCallForwardingOption: not possible in CDMA"); + Rlog.e(LOG_TAG, "setCallForwardingOption: not possible in CDMA"); } public void getOutgoingCallerIdDisplay(Message onComplete) { - Log.e(LOG_TAG, "getOutgoingCallerIdDisplay: not possible in CDMA"); + Rlog.e(LOG_TAG, "getOutgoingCallerIdDisplay: not possible in CDMA"); } public boolean getCallForwardingIndicator() { - Log.e(LOG_TAG, "getCallForwardingIndicator: not possible in CDMA"); + Rlog.e(LOG_TAG, "getCallForwardingIndicator: not possible in CDMA"); return false; } public void explicitCallTransfer() { - Log.e(LOG_TAG, "explicitCallTransfer: not possible in CDMA"); + Rlog.e(LOG_TAG, "explicitCallTransfer: not possible in CDMA"); } public String getLine1AlphaTag() { - Log.e(LOG_TAG, "getLine1AlphaTag: not possible in CDMA"); + Rlog.e(LOG_TAG, "getLine1AlphaTag: not possible in CDMA"); return null; } @@ -853,7 +853,7 @@ public class CDMAPhone extends PhoneBase { Intent intent = new Intent(TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED); intent.putExtra(PhoneConstants.PHONE_IN_ECM_STATE, mIsPhoneInEcmState); ActivityManagerNative.broadcastStickyIntent(intent,null,UserHandle.USER_ALL); - if (DBG) Log.d(LOG_TAG, "sendEmergencyCallbackModeChange"); + if (DBG) Rlog.d(LOG_TAG, "sendEmergencyCallbackModeChange"); } @Override @@ -867,7 +867,7 @@ public class CDMAPhone extends PhoneBase { private void handleEnterEmergencyCallbackMode(Message msg) { if (DBG) { - Log.d(LOG_TAG, "handleEnterEmergencyCallbackMode,mIsPhoneInEcmState= " + Rlog.d(LOG_TAG, "handleEnterEmergencyCallbackMode,mIsPhoneInEcmState= " + mIsPhoneInEcmState); } // if phone is not in Ecm mode, and it's changed to Ecm mode @@ -890,7 +890,7 @@ public class CDMAPhone extends PhoneBase { private void handleExitEmergencyCallbackMode(Message msg) { AsyncResult ar = (AsyncResult)msg.obj; if (DBG) { - Log.d(LOG_TAG, "handleExitEmergencyCallbackMode,ar.exception , mIsPhoneInEcmState " + Rlog.d(LOG_TAG, "handleExitEmergencyCallbackMode,ar.exception , mIsPhoneInEcmState " + ar.exception + mIsPhoneInEcmState); } // Remove pending exit Ecm runnable, if any @@ -930,7 +930,7 @@ public class CDMAPhone extends PhoneBase { mEcmTimerResetRegistrants.notifyResult(Boolean.FALSE); break; default: - Log.e(LOG_TAG, "handleTimerInEmergencyCallbackMode, unsupported action " + action); + Rlog.e(LOG_TAG, "handleTimerInEmergencyCallbackMode, unsupported action " + action); } } @@ -968,7 +968,7 @@ public class CDMAPhone extends PhoneBase { break; } - if (DBG) Log.d(LOG_TAG, "Baseband version: " + ar.result); + if (DBG) Rlog.d(LOG_TAG, "Baseband version: " + ar.result); setSystemProperty(TelephonyProperties.PROPERTY_BASEBAND_VERSION, (String)ar.result); } break; @@ -1003,40 +1003,40 @@ public class CDMAPhone extends PhoneBase { break; case EVENT_RUIM_RECORDS_LOADED:{ - Log.d(LOG_TAG, "Event EVENT_RUIM_RECORDS_LOADED Received"); + Rlog.d(LOG_TAG, "Event EVENT_RUIM_RECORDS_LOADED Received"); updateCurrentCarrierInProvider(); } break; case EVENT_RADIO_OFF_OR_NOT_AVAILABLE:{ - Log.d(LOG_TAG, "Event EVENT_RADIO_OFF_OR_NOT_AVAILABLE Received"); + Rlog.d(LOG_TAG, "Event EVENT_RADIO_OFF_OR_NOT_AVAILABLE Received"); } break; case EVENT_RADIO_ON:{ - Log.d(LOG_TAG, "Event EVENT_RADIO_ON Received"); + Rlog.d(LOG_TAG, "Event EVENT_RADIO_ON Received"); handleCdmaSubscriptionSource(mCdmaSSM.getCdmaSubscriptionSource()); } break; case EVENT_CDMA_SUBSCRIPTION_SOURCE_CHANGED:{ - Log.d(LOG_TAG, "EVENT_CDMA_SUBSCRIPTION_SOURCE_CHANGED"); + Rlog.d(LOG_TAG, "EVENT_CDMA_SUBSCRIPTION_SOURCE_CHANGED"); handleCdmaSubscriptionSource(mCdmaSSM.getCdmaSubscriptionSource()); } break; case EVENT_SSN:{ - Log.d(LOG_TAG, "Event EVENT_SSN Received"); + Rlog.d(LOG_TAG, "Event EVENT_SSN Received"); } break; case EVENT_REGISTERED_TO_NETWORK:{ - Log.d(LOG_TAG, "Event EVENT_REGISTERED_TO_NETWORK Received"); + Rlog.d(LOG_TAG, "Event EVENT_REGISTERED_TO_NETWORK Received"); } break; case EVENT_NV_READY:{ - Log.d(LOG_TAG, "Event EVENT_NV_READY Received"); + Rlog.d(LOG_TAG, "Event EVENT_NV_READY Received"); prepareEri(); } break; @@ -1098,7 +1098,7 @@ public class CDMAPhone extends PhoneBase { break; default: - Log.e(LOG_TAG,"Unknown icc records event code " + eventCode); + Rlog.e(LOG_TAG,"Unknown icc records event code " + eventCode); break; } } @@ -1163,7 +1163,7 @@ public class CDMAPhone extends PhoneBase { * @param response Callback message is empty on completion */ public void activateCellBroadcastSms(int activate, Message response) { - Log.e(LOG_TAG, "[CDMAPhone] activateCellBroadcastSms() is obsolete; use SmsManager"); + Rlog.e(LOG_TAG, "[CDMAPhone] activateCellBroadcastSms() is obsolete; use SmsManager"); response.sendToTarget(); } @@ -1173,7 +1173,7 @@ public class CDMAPhone extends PhoneBase { * @param response Callback message is empty on completion */ public void getCellBroadcastSmsConfig(Message response) { - Log.e(LOG_TAG, "[CDMAPhone] getCellBroadcastSmsConfig() is obsolete; use SmsManager"); + Rlog.e(LOG_TAG, "[CDMAPhone] getCellBroadcastSmsConfig() is obsolete; use SmsManager"); response.sendToTarget(); } @@ -1183,7 +1183,7 @@ public class CDMAPhone extends PhoneBase { * @param response Callback message is empty on completion */ public void setCellBroadcastSmsConfig(int[] configValuesArray, Message response) { - Log.e(LOG_TAG, "[CDMAPhone] setCellBroadcastSmsConfig() is obsolete; use SmsManager"); + Rlog.e(LOG_TAG, "[CDMAPhone] setCellBroadcastSmsConfig() is obsolete; use SmsManager"); response.sendToTarget(); } @@ -1255,7 +1255,7 @@ public class CDMAPhone extends PhoneBase { dialStr.substring (IS683A_FEATURE_CODE_NUM_DIGITS, IS683A_FEATURE_CODE_NUM_DIGITS + IS683A_SYS_SEL_CODE_NUM_DIGITS)); } - if (DBG) Log.d(LOG_TAG, "extractSelCodeFromOtaSpNum " + sysSelCodeInt); + if (DBG) Rlog.d(LOG_TAG, "extractSelCodeFromOtaSpNum " + sysSelCodeInt); return sysSelCodeInt; } @@ -1285,7 +1285,7 @@ public class CDMAPhone extends PhoneBase { } catch (NumberFormatException ex) { // If the carrier ota sp number schema is not correct, we still allow dial // and only log the error: - Log.e(LOG_TAG, "checkOtaSpNumBasedOnSysSelCode, error", ex); + Rlog.e(LOG_TAG, "checkOtaSpNumBasedOnSysSelCode, error", ex); } return isOtaSpNum; } @@ -1322,7 +1322,7 @@ public class CDMAPhone extends PhoneBase { if (!TextUtils.isEmpty(mCarrierOtaSpNumSchema)) { Matcher m = pOtaSpNumSchema.matcher(mCarrierOtaSpNumSchema); if (DBG) { - Log.d(LOG_TAG, "isCarrierOtaSpNum,schema" + mCarrierOtaSpNumSchema); + Rlog.d(LOG_TAG, "isCarrierOtaSpNum,schema" + mCarrierOtaSpNumSchema); } if (m.find()) { @@ -1333,7 +1333,7 @@ public class CDMAPhone extends PhoneBase { isOtaSpNum=checkOtaSpNumBasedOnSysSelCode(sysSelCodeInt,sch); } else { if (DBG) { - Log.d(LOG_TAG, "isCarrierOtaSpNum,sysSelCodeInt is invalid"); + Rlog.d(LOG_TAG, "isCarrierOtaSpNum,sysSelCodeInt is invalid"); } } } else if (!TextUtils.isEmpty(sch[0]) && sch[0].equals("FC")) { @@ -1342,21 +1342,21 @@ public class CDMAPhone extends PhoneBase { if (dialStr.regionMatches(0,fc,0,fcLen)) { isOtaSpNum = true; } else { - if (DBG) Log.d(LOG_TAG, "isCarrierOtaSpNum,not otasp number"); + if (DBG) Rlog.d(LOG_TAG, "isCarrierOtaSpNum,not otasp number"); } } else { if (DBG) { - Log.d(LOG_TAG, "isCarrierOtaSpNum,ota schema not supported" + sch[0]); + Rlog.d(LOG_TAG, "isCarrierOtaSpNum,ota schema not supported" + sch[0]); } } } else { if (DBG) { - Log.d(LOG_TAG, "isCarrierOtaSpNum,ota schema pattern not right" + + Rlog.d(LOG_TAG, "isCarrierOtaSpNum,ota schema pattern not right" + mCarrierOtaSpNumSchema); } } } else { - if (DBG) Log.d(LOG_TAG, "isCarrierOtaSpNum,ota schema pattern empty"); + if (DBG) Rlog.d(LOG_TAG, "isCarrierOtaSpNum,ota schema pattern empty"); } return isOtaSpNum; } @@ -1378,7 +1378,7 @@ public class CDMAPhone extends PhoneBase { isOtaSpNum = isCarrierOtaSpNum(dialableStr); } } - if (DBG) Log.d(LOG_TAG, "isOtaSpNumber " + isOtaSpNum); + if (DBG) Rlog.d(LOG_TAG, "isOtaSpNumber " + isOtaSpNum); return isOtaSpNum; } @@ -1431,9 +1431,9 @@ public class CDMAPhone extends PhoneBase { iso = MccTable.countryCodeForMcc(Integer.parseInt( operatorNumeric.substring(0,3))); } catch (NumberFormatException ex) { - Log.w(LOG_TAG, "countryCodeForMcc error" + ex); + Rlog.w(LOG_TAG, "countryCodeForMcc error" + ex); } catch (StringIndexOutOfBoundsException ex) { - Log.w(LOG_TAG, "countryCodeForMcc error" + ex); + Rlog.w(LOG_TAG, "countryCodeForMcc error" + ex); } setSystemProperty(PROPERTY_ICC_OPERATOR_ISO_COUNTRY, iso); @@ -1460,7 +1460,7 @@ public class CDMAPhone extends PhoneBase { return true; } catch (SQLException e) { - Log.e(LOG_TAG, "Can't store current operator", e); + Rlog.e(LOG_TAG, "Can't store current operator", e); } } return false; @@ -1509,7 +1509,7 @@ public class CDMAPhone extends PhoneBase { protected void log(String s) { if (DBG) - Log.d(LOG_TAG, "[CDMAPhone] " + s); + Rlog.d(LOG_TAG, "[CDMAPhone] " + s); } @Override diff --git a/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java index a7d5d0a7d..b6a9b18d9 100644 --- a/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java @@ -23,7 +23,7 @@ import android.os.Registrant; import android.os.RegistrantList; import android.telephony.PhoneNumberUtils; import android.telephony.ServiceState; -import android.util.Log; +import android.telephony.Rlog; import android.os.SystemProperties; import com.android.internal.telephony.CallStateException; @@ -112,14 +112,14 @@ public final class CdmaCallTracker extends CallTracker { try { if(c != null) hangup(c); } catch (CallStateException ex) { - Log.e(LOG_TAG, "unexpected error on hangup during dispose"); + Rlog.e(LOG_TAG, "unexpected error on hangup during dispose"); } } try { if(pendingMO != null) hangup(pendingMO); } catch (CallStateException ex) { - Log.e(LOG_TAG, "unexpected error on hangup during dispose"); + Rlog.e(LOG_TAG, "unexpected error on hangup during dispose"); } clearDisconnected(); @@ -128,7 +128,7 @@ public final class CdmaCallTracker extends CallTracker { @Override protected void finalize() { - Log.d(LOG_TAG, "CdmaCallTracker finalized"); + Rlog.d(LOG_TAG, "CdmaCallTracker finalized"); } //***** Instance Methods @@ -274,7 +274,7 @@ public final class CdmaCallTracker extends CallTracker { void acceptCall() throws CallStateException { if (ringingCall.getState() == CdmaCall.State.INCOMING) { - Log.i("phone", "acceptCall: incoming..."); + Rlog.i("phone", "acceptCall: incoming..."); // Always unmute when answering a new call setMute(false); cm.acceptCall(obtainCompleteMessage()); @@ -386,7 +386,7 @@ public final class CdmaCallTracker extends CallTracker { boolean canTransfer() { - Log.e(LOG_TAG, "canTransfer: not possible in CDMA"); + Rlog.e(LOG_TAG, "canTransfer: not possible in CDMA"); return false; } @@ -436,7 +436,7 @@ public final class CdmaCallTracker extends CallTracker { cm.getCurrentCalls(lastRelevantPoll); } else if (pendingOperations < 0) { // this should never happen - Log.e(LOG_TAG,"CdmaCallTracker.pendingOperations < 0"); + Rlog.e(LOG_TAG,"CdmaCallTracker.pendingOperations < 0"); pendingOperations = 0; } } @@ -540,7 +540,7 @@ public final class CdmaCallTracker extends CallTracker { "poll: hangupPendingMO, hangup conn " + i); hangup(connections[i]); } catch (CallStateException ex) { - Log.e(LOG_TAG, "unexpected error on hangup"); + Rlog.e(LOG_TAG, "unexpected error on hangup"); } // Do not continue processing this poll @@ -608,7 +608,7 @@ public final class CdmaCallTracker extends CallTracker { // We should follow the rule of MT calls taking precedence over MO calls // when there is conflict, so here we drop the call info from dc and // continue to use the call info from conn, and only take a log. - Log.e(LOG_TAG,"Error in RIL, Phantom call appeared " + dc); + Rlog.e(LOG_TAG,"Error in RIL, Phantom call appeared " + dc); } } else { boolean changed; @@ -641,7 +641,7 @@ public final class CdmaCallTracker extends CallTracker { // We expect the pending call to appear in the list // If it does not, we land here if (pendingMO != null) { - Log.d(LOG_TAG,"Pending MO dropped before poll fg state:" + Rlog.d(LOG_TAG,"Pending MO dropped before poll fg state:" + foregroundCall.getState()); droppedDuringPoll.add(pendingMO); @@ -756,7 +756,7 @@ public final class CdmaCallTracker extends CallTracker { } catch (CallStateException ex) { // Ignore "connection not found" // Call may have hung up already - Log.w(LOG_TAG,"CdmaCallTracker WARN: hangup() on absent connection " + Rlog.w(LOG_TAG,"CdmaCallTracker WARN: hangup() on absent connection " + conn); } } @@ -776,7 +776,7 @@ public final class CdmaCallTracker extends CallTracker { } catch (CallStateException ex) { // Ignore "connection not found" // Call may have hung up already - Log.w(LOG_TAG,"CdmaCallTracker WARN: separate() on absent connection " + Rlog.w(LOG_TAG,"CdmaCallTracker WARN: separate() on absent connection " + conn); } } @@ -867,7 +867,7 @@ public final class CdmaCallTracker extends CallTracker { cm.hangupConnection(cn.getCDMAIndex(), obtainCompleteMessage()); } } catch (CallStateException ex) { - Log.e(LOG_TAG, "hangupConnectionByIndex caught " + ex); + Rlog.e(LOG_TAG, "hangupConnectionByIndex caught " + ex); } } @@ -949,7 +949,7 @@ public final class CdmaCallTracker extends CallTracker { switch (msg.what) { case EVENT_POLL_CALLS_RESULT:{ - Log.d(LOG_TAG, "Event EVENT_POLL_CALLS_RESULT Received"); + Rlog.d(LOG_TAG, "Event EVENT_POLL_CALLS_RESULT Received"); ar = (AsyncResult)msg.obj; if(msg == lastRelevantPoll) { @@ -982,7 +982,7 @@ public final class CdmaCallTracker extends CallTracker { // An exception occurred...just treat the disconnect // cause as "normal" causeCode = CallFailCause.NORMAL_CLEARING; - Log.i(LOG_TAG, + Rlog.i(LOG_TAG, "Exception during getLastCallFailCause, assuming normal disconnect"); } else { causeCode = ((int[])ar.result)[0]; @@ -1028,7 +1028,7 @@ public final class CdmaCallTracker extends CallTracker { ar = (AsyncResult)msg.obj; if (ar.exception == null) { handleCallWaitingInfo((CdmaCallWaitingNotification)ar.result); - Log.d(LOG_TAG, "Event EVENT_CALL_WAITING_INFO_CDMA Received"); + Rlog.d(LOG_TAG, "Event EVENT_CALL_WAITING_INFO_CDMA Received"); } break; @@ -1056,7 +1056,7 @@ public final class CdmaCallTracker extends CallTracker { case CDMAPhone.CANCEL_ECM_TIMER: mIsEcmTimerCanceled = true; break; case CDMAPhone.RESTART_ECM_TIMER: mIsEcmTimerCanceled = false; break; default: - Log.e(LOG_TAG, "handleEcmTimer, unsupported action " + action); + Rlog.e(LOG_TAG, "handleEcmTimer, unsupported action " + action); } } @@ -1106,7 +1106,7 @@ public final class CdmaCallTracker extends CallTracker { // Something strange happened: a call which is neither // a ringing call nor the one we created. It could be the // call collision result from RIL - Log.e(LOG_TAG,"Phantom call appeared " + dc); + Rlog.e(LOG_TAG,"Phantom call appeared " + dc); // If it's a connected call, set the connect time so that // it's non-zero. It may not be accurate, but at least // it won't appear as a Missed Call. @@ -1129,7 +1129,7 @@ public final class CdmaCallTracker extends CallTracker { } protected void log(String msg) { - Log.d(LOG_TAG, "[CdmaCallTracker] " + msg); + Rlog.d(LOG_TAG, "[CdmaCallTracker] " + msg); } @Override diff --git a/src/java/com/android/internal/telephony/cdma/CdmaCallWaitingNotification.java b/src/java/com/android/internal/telephony/cdma/CdmaCallWaitingNotification.java index 0a9bdb738..1d50c8b82 100644 --- a/src/java/com/android/internal/telephony/cdma/CdmaCallWaitingNotification.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaCallWaitingNotification.java @@ -16,7 +16,7 @@ package com.android.internal.telephony.cdma; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.Connection; import com.android.internal.telephony.PhoneConstants; @@ -62,7 +62,7 @@ public class CdmaCallWaitingNotification { case 2: return PhoneConstants.PRESENTATION_UNKNOWN; default: // This shouldn't happen, just log an error and treat as Unknown - Log.d(LOG_TAG, "Unexpected presentation " + cli); + Rlog.d(LOG_TAG, "Unexpected presentation " + cli); return PhoneConstants.PRESENTATION_UNKNOWN; } } diff --git a/src/java/com/android/internal/telephony/cdma/CdmaConnection.java b/src/java/com/android/internal/telephony/cdma/CdmaConnection.java index 17eecbd77..4fe1dc03a 100755 --- a/src/java/com/android/internal/telephony/cdma/CdmaConnection.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaConnection.java @@ -26,7 +26,7 @@ import android.os.PowerManager; import android.os.Registrant; import android.os.SystemClock; import android.os.SystemProperties; -import android.util.Log; +import android.telephony.Rlog; import android.text.TextUtils; import android.telephony.PhoneNumberUtils; @@ -151,9 +151,9 @@ public class CdmaConnection extends Connection { h = new MyHandler(owner.getLooper()); this.dialString = dialString; - Log.d(LOG_TAG, "[CDMAConn] CdmaConnection: dialString=" + dialString); + Rlog.d(LOG_TAG, "[CDMAConn] CdmaConnection: dialString=" + dialString); dialString = formatDialString(dialString); - Log.d(LOG_TAG, "[CDMAConn] CdmaConnection:formated dialString=" + dialString); + Rlog.d(LOG_TAG, "[CDMAConn] CdmaConnection:formated dialString=" + dialString); this.address = PhoneNumberUtils.extractNetworkPortionAlt(dialString); this.postDialString = PhoneNumberUtils.extractPostDialPortion(dialString); @@ -304,7 +304,7 @@ public class CdmaConnection extends Connection { public void proceedAfterWaitChar() { if (postDialState != PostDialState.WAIT) { - Log.w(LOG_TAG, "CdmaConnection.proceedAfterWaitChar(): Expected " + Rlog.w(LOG_TAG, "CdmaConnection.proceedAfterWaitChar(): Expected " + "getPostDialState() to be WAIT but was " + postDialState); return; } @@ -316,7 +316,7 @@ public class CdmaConnection extends Connection { public void proceedAfterWildChar(String str) { if (postDialState != PostDialState.WILD) { - Log.w(LOG_TAG, "CdmaConnection.proceedAfterWaitChar(): Expected " + Rlog.w(LOG_TAG, "CdmaConnection.proceedAfterWaitChar(): Expected " + "getPostDialState() to be WILD but was " + postDialState); return; } @@ -451,7 +451,7 @@ public class CdmaConnection extends Connection { if (!disconnected) { doDisconnect(); - if (false) Log.d(LOG_TAG, + if (false) Rlog.d(LOG_TAG, "[CDMAConn] onDisconnect: cause=" + cause); owner.phone.notifyDisconnect(this); @@ -468,7 +468,7 @@ public class CdmaConnection extends Connection { onLocalDisconnect() { if (!disconnected) { doDisconnect(); - if (false) Log.d(LOG_TAG, + if (false) Rlog.d(LOG_TAG, "[CDMAConn] onLoalDisconnect" ); if (parent != null) { @@ -679,7 +679,7 @@ public class CdmaConnection extends Connection { * and or onConnectedInOrOut. */ if (mPartialWakeLock.isHeld()) { - Log.e(LOG_TAG, "[CdmaConn] UNEXPECTED; mPartialWakeLock is held when finalizing."); + Rlog.e(LOG_TAG, "[CdmaConn] UNEXPECTED; mPartialWakeLock is held when finalizing."); } releaseWakeLock(); } @@ -690,7 +690,7 @@ public class CdmaConnection extends Connection { if (postDialState == PostDialState.CANCELLED) { releaseWakeLock(); - //Log.v("CDMA", "##### processNextPostDialChar: postDialState == CANCELLED, bail"); + //Rlog.v("CDMA", "##### processNextPostDialChar: postDialState == CANCELLED, bail"); return; } @@ -716,7 +716,7 @@ public class CdmaConnection extends Connection { // Will call processNextPostDialChar h.obtainMessage(EVENT_NEXT_POST_DIAL).sendToTarget(); // Don't notify application - Log.e("CDMA", "processNextPostDialChar: c=" + c + " isn't valid!"); + Rlog.e("CDMA", "processNextPostDialChar: c=" + c + " isn't valid!"); return; } } @@ -936,7 +936,7 @@ public class CdmaConnection extends Connection { } private void log(String msg) { - Log.d(LOG_TAG, "[CDMAConn] " + msg); + Rlog.d(LOG_TAG, "[CDMAConn] " + msg); } @Override diff --git a/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java index bda4ae4d0..989f19f34 100644 --- a/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java @@ -34,7 +34,7 @@ import android.os.Message; import android.os.SystemClock; import android.os.SystemProperties; -import android.util.Log; +import android.telephony.Rlog; import android.util.EventLog; import com.android.internal.telephony.IccCardApplicationStatus.AppState; @@ -548,12 +548,12 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { @Override protected void log(String s) { - Log.d(LOG_TAG, "[CdmaLteSST] " + s); + Rlog.d(LOG_TAG, "[CdmaLteSST] " + s); } @Override protected void loge(String s) { - Log.e(LOG_TAG, "[CdmaLteSST] " + s); + Rlog.e(LOG_TAG, "[CdmaLteSST] " + s); } @Override diff --git a/src/java/com/android/internal/telephony/cdma/CdmaMmiCode.java b/src/java/com/android/internal/telephony/cdma/CdmaMmiCode.java index 8dd8c2e6c..eaf5d0193 100644 --- a/src/java/com/android/internal/telephony/cdma/CdmaMmiCode.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaMmiCode.java @@ -24,7 +24,7 @@ import com.android.internal.telephony.MmiCode; import android.os.AsyncResult; import android.os.Handler; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import java.util.regex.Pattern; import java.util.regex.Matcher; @@ -183,7 +183,7 @@ public final class CdmaMmiCode extends Handler implements MmiCode { } public boolean isUssdRequest() { - Log.w(LOG_TAG, "isUssdRequest is not implemented in CdmaMmiCode"); + Rlog.w(LOG_TAG, "isUssdRequest is not implemented in CdmaMmiCode"); return false; } @@ -239,7 +239,7 @@ public final class CdmaMmiCode extends Handler implements MmiCode { ar = (AsyncResult) (msg.obj); onSetComplete(ar); } else { - Log.e(LOG_TAG, "Unexpected reply"); + Rlog.e(LOG_TAG, "Unexpected reply"); } } // Private instance methods diff --git a/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java b/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java index 1a49db9eb..847311328 100755 --- a/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java @@ -39,7 +39,7 @@ import android.telephony.SmsCbMessage; import android.telephony.SmsManager; import android.telephony.cdma.CdmaSmsCbProgramData; import android.telephony.cdma.CdmaSmsCbProgramResults; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.GsmAlphabet; @@ -116,7 +116,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher { private void handleServiceCategoryProgramData(SmsMessage sms) { ArrayList<CdmaSmsCbProgramData> programDataList = sms.getSmsCbProgramData(); if (programDataList == null) { - Log.e(TAG, "handleServiceCategoryProgramData: program data list is null!"); + Rlog.e(TAG, "handleServiceCategoryProgramData: program data list is null!"); return; } @@ -132,7 +132,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher { // If sms is null, means there was a parsing error. if (smsb == null) { - Log.e(TAG, "dispatchMessage: message is null"); + Rlog.e(TAG, "dispatchMessage: message is null"); return Intents.RESULT_SMS_GENERIC_ERROR; } @@ -143,7 +143,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher { if (mSmsReceiveDisabled) { // Device doesn't support receiving SMS, - Log.d(TAG, "Received short message on device which doesn't support " + Rlog.d(TAG, "Received short message on device which doesn't support " + "receiving SMS. Ignored."); return Intents.RESULT_SMS_HANDLED; } @@ -152,7 +152,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher { // Handle CMAS emergency broadcast messages. if (SmsEnvelope.MESSAGE_TYPE_BROADCAST == sms.getMessageType()) { - Log.d(TAG, "Broadcast type message"); + Rlog.d(TAG, "Broadcast type message"); SmsCbMessage message = sms.parseBroadcastSms(); if (message != null) { dispatchBroadcastMessage(message); @@ -175,7 +175,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher { (SmsEnvelope.TELESERVICE_MWI == teleService)) { // handling Voicemail int voicemailCount = sms.getNumOfVoicemails(); - Log.d(TAG, "Voicemail count=" + voicemailCount); + Rlog.d(TAG, "Voicemail count=" + voicemailCount); // Store the voicemail count in preferences. SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences( mContext); @@ -194,7 +194,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher { handled = true; } else if ((sms.getUserData() == null)) { if (false) { - Log.d(TAG, "Received SMS without user data"); + Rlog.d(TAG, "Received SMS without user data"); } handled = true; } @@ -243,14 +243,14 @@ final class CdmaSMSDispatcher extends SMSDispatcher { int msgType = (0xFF & pdu[index++]); if (msgType != 0) { - Log.w(TAG, "Received a WAP SMS which is not WDP. Discard."); + Rlog.w(TAG, "Received a WAP SMS which is not WDP. Discard."); return Intents.RESULT_SMS_HANDLED; } int totalSegments = (0xFF & pdu[index++]); // >= 1 int segment = (0xFF & pdu[index++]); // >= 0 if (segment >= totalSegments) { - Log.e(TAG, "WDP bad segment #" + segment + " expecting 0-" + (totalSegments - 1)); + Rlog.e(TAG, "WDP bad segment #" + segment + " expecting 0-" + (totalSegments - 1)); return Intents.RESULT_SMS_HANDLED; } @@ -273,7 +273,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher { } // Lookup all other related parts - Log.i(TAG, "Received WAP PDU. Type = " + msgType + ", originator = " + address + Rlog.i(TAG, "Received WAP PDU. Type = " + msgType + ", originator = " + address + ", src-port = " + sourcePort + ", dst-port = " + destinationPort + ", ID = " + referenceNumber + ", segment# = " + segment + '/' + totalSegments); @@ -344,7 +344,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher { } catch (CanceledException ex) {} } if (false) { - Log.d(TAG, "Block SMS in Emergency Callback mode"); + Rlog.d(TAG, "Block SMS in Emergency Callback mode"); } return; } @@ -443,23 +443,23 @@ final class CdmaSMSDispatcher extends SMSDispatcher { int rc = getResultCode(); boolean success = (rc == Activity.RESULT_OK) || (rc == Intents.RESULT_SMS_HANDLED); if (!success) { - Log.e(TAG, "SCP results error: result code = " + rc); + Rlog.e(TAG, "SCP results error: result code = " + rc); return; } Bundle extras = getResultExtras(false); if (extras == null) { - Log.e(TAG, "SCP results error: missing extras"); + Rlog.e(TAG, "SCP results error: missing extras"); return; } String sender = extras.getString("sender"); if (sender == null) { - Log.e(TAG, "SCP results error: missing sender extra."); + Rlog.e(TAG, "SCP results error: missing sender extra."); return; } ArrayList<CdmaSmsCbProgramResults> results = extras.getParcelableArrayList("results"); if (results == null) { - Log.e(TAG, "SCP results error: missing results extra."); + Rlog.e(TAG, "SCP results error: missing results extra."); return; } @@ -492,7 +492,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher { // Ignore the RIL response. TODO: implement retry if SMS send fails. mCm.sendCdmaSms(baos.toByteArray(), null); } catch (IOException e) { - Log.e(TAG, "exception creating SCP results PDU", e); + Rlog.e(TAG, "exception creating SCP results PDU", e); } finally { try { dos.close(); diff --git a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index ca38f54c4..3bda2d64a 100755 --- a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java @@ -57,7 +57,7 @@ import android.telephony.SignalStrength; import android.telephony.cdma.CdmaCellLocation; import android.text.TextUtils; import android.util.EventLog; -import android.util.Log; +import android.telephony.Rlog; import android.util.TimeUtils; import java.io.FileDescriptor; @@ -1738,12 +1738,12 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { @Override protected void log(String s) { - Log.d(LOG_TAG, "[CdmaSST] " + s); + Rlog.d(LOG_TAG, "[CdmaSST] " + s); } @Override protected void loge(String s) { - Log.e(LOG_TAG, "[CdmaSST] " + s); + Rlog.e(LOG_TAG, "[CdmaSST] " + s); } @Override diff --git a/src/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java b/src/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java index 6d82f3daa..972d3c38b 100644 --- a/src/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java @@ -28,7 +28,7 @@ import android.os.Message; import android.os.Registrant; import android.os.RegistrantList; import android.provider.Settings; -import android.util.Log; +import android.telephony.Rlog; /** * Class that handles the CDMA subscription source changed events from RIL @@ -182,15 +182,15 @@ public class CdmaSubscriptionSourceManager extends Handler { } private void log(String s) { - Log.d(LOG_TAG, "[CdmaSSM] " + s); + Rlog.d(LOG_TAG, "[CdmaSSM] " + s); } private void loge(String s) { - Log.e(LOG_TAG, "[CdmaSSM] " + s); + Rlog.e(LOG_TAG, "[CdmaSSM] " + s); } private void logw(String s) { - Log.w(LOG_TAG, "[CdmaSSM] " + s); + Rlog.w(LOG_TAG, "[CdmaSSM] " + s); } } diff --git a/src/java/com/android/internal/telephony/cdma/EriManager.java b/src/java/com/android/internal/telephony/cdma/EriManager.java index 1bcc90a07..bb1707cce 100644 --- a/src/java/com/android/internal/telephony/cdma/EriManager.java +++ b/src/java/com/android/internal/telephony/cdma/EriManager.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.res.Resources; import android.content.res.XmlResourceParser; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import android.util.Xml; import com.android.internal.telephony.Phone; @@ -159,22 +159,22 @@ public final class EriManager { Resources r = mContext.getResources(); try { - if (DBG) Log.d(LOG_TAG, "loadEriFileFromXml: check for alternate file"); + if (DBG) Rlog.d(LOG_TAG, "loadEriFileFromXml: check for alternate file"); stream = new FileInputStream( r.getString(com.android.internal.R.string.alternate_eri_file)); parser = Xml.newPullParser(); parser.setInput(stream, null); - if (DBG) Log.d(LOG_TAG, "loadEriFileFromXml: opened alternate file"); + if (DBG) Rlog.d(LOG_TAG, "loadEriFileFromXml: opened alternate file"); } catch (FileNotFoundException e) { - if (DBG) Log.d(LOG_TAG, "loadEriFileFromXml: no alternate file"); + if (DBG) Rlog.d(LOG_TAG, "loadEriFileFromXml: no alternate file"); parser = null; } catch (XmlPullParserException e) { - if (DBG) Log.d(LOG_TAG, "loadEriFileFromXml: no parser for alternate file"); + if (DBG) Rlog.d(LOG_TAG, "loadEriFileFromXml: no parser for alternate file"); parser = null; } if (parser == null) { - if (DBG) Log.d(LOG_TAG, "loadEriFileFromXml: open normal file"); + if (DBG) Rlog.d(LOG_TAG, "loadEriFileFromXml: open normal file"); parser = r.getXml(com.android.internal.R.xml.eri); } @@ -193,7 +193,7 @@ public final class EriManager { String name = parser.getName(); if (name == null) { if (parsedEriEntries != mEriFile.mNumberOfEriEntries) - Log.e(LOG_TAG, "Error Parsing ERI file: " + mEriFile.mNumberOfEriEntries + Rlog.e(LOG_TAG, "Error Parsing ERI file: " + mEriFile.mNumberOfEriEntries + " defined, " + parsedEriEntries + " parsed!"); break; } else if (name.equals("CallPromptId")) { @@ -202,7 +202,7 @@ public final class EriManager { if (id >= 0 && id <= 2) { mEriFile.mCallPromptId[id] = text; } else { - Log.e(LOG_TAG, "Error Parsing ERI file: found" + id + " CallPromptId"); + Rlog.e(LOG_TAG, "Error Parsing ERI file: found" + id + " CallPromptId"); } } else if (name.equals("EriInfo")) { @@ -220,11 +220,11 @@ public final class EriManager { } } - if (DBG) Log.d(LOG_TAG, "loadEriFileFromXml: eri parsing successful, file loaded"); + if (DBG) Rlog.d(LOG_TAG, "loadEriFileFromXml: eri parsing successful, file loaded"); isEriFileLoaded = true; } catch (Exception e) { - Log.e(LOG_TAG, "Got exception while loading ERI file.", e); + Rlog.e(LOG_TAG, "Got exception while loading ERI file.", e); } finally { if (parser instanceof XmlResourceParser) { ((XmlResourceParser)parser).close(); @@ -290,7 +290,7 @@ public final class EriManager { if (isEriFileLoaded) { EriInfo eriInfo = getEriInfo(roamInd); if (eriInfo != null) { - if (VDBG) Log.v(LOG_TAG, "ERI roamInd " + roamInd + " found in ERI file"); + if (VDBG) Rlog.v(LOG_TAG, "ERI roamInd " + roamInd + " found in ERI file"); ret = new EriDisplayInformation( eriInfo.mIconIndex, eriInfo.mIconMode, @@ -398,16 +398,16 @@ public final class EriManager { default: if (!isEriFileLoaded) { // ERI file NOT loaded - if (DBG) Log.d(LOG_TAG, "ERI File not loaded"); + if (DBG) Rlog.d(LOG_TAG, "ERI File not loaded"); if(defRoamInd > 2) { - if (VDBG) Log.v(LOG_TAG, "ERI defRoamInd > 2 ...flashing"); + if (VDBG) Rlog.v(LOG_TAG, "ERI defRoamInd > 2 ...flashing"); ret = new EriDisplayInformation( EriInfo.ROAMING_INDICATOR_FLASH, EriInfo.ROAMING_ICON_MODE_FLASH, mContext.getText(com.android.internal .R.string.roamingText2).toString()); } else { - if (VDBG) Log.v(LOG_TAG, "ERI defRoamInd <= 2"); + if (VDBG) Rlog.v(LOG_TAG, "ERI defRoamInd <= 2"); switch (defRoamInd) { case EriInfo.ROAMING_INDICATOR_ON: ret = new EriDisplayInformation( @@ -443,11 +443,11 @@ public final class EriManager { EriInfo defEriInfo = getEriInfo(defRoamInd); if (eriInfo == null) { if (VDBG) { - Log.v(LOG_TAG, "ERI roamInd " + roamInd + Rlog.v(LOG_TAG, "ERI roamInd " + roamInd + " not found in ERI file ...using defRoamInd " + defRoamInd); } if(defEriInfo == null) { - Log.e(LOG_TAG, "ERI defRoamInd " + defRoamInd + Rlog.e(LOG_TAG, "ERI defRoamInd " + defRoamInd + " not found in ERI file ...on"); ret = new EriDisplayInformation( EriInfo.ROAMING_INDICATOR_ON, @@ -457,7 +457,7 @@ public final class EriManager { } else { if (VDBG) { - Log.v(LOG_TAG, "ERI defRoamInd " + defRoamInd + " found in ERI file"); + Rlog.v(LOG_TAG, "ERI defRoamInd " + defRoamInd + " found in ERI file"); } ret = new EriDisplayInformation( defEriInfo.mIconIndex, @@ -465,7 +465,7 @@ public final class EriManager { defEriInfo.mEriText); } } else { - if (VDBG) Log.v(LOG_TAG, "ERI roamInd " + roamInd + " found in ERI file"); + if (VDBG) Rlog.v(LOG_TAG, "ERI roamInd " + roamInd + " found in ERI file"); ret = new EriDisplayInformation( eriInfo.mIconIndex, eriInfo.mIconMode, @@ -474,7 +474,7 @@ public final class EriManager { } break; } - if (VDBG) Log.v(LOG_TAG, "Displaying ERI " + ret.toString()); + if (VDBG) Rlog.v(LOG_TAG, "Displaying ERI " + ret.toString()); return ret; } diff --git a/src/java/com/android/internal/telephony/cdma/RuimFileHandler.java b/src/java/com/android/internal/telephony/cdma/RuimFileHandler.java index 4c271f962..7d8a893b3 100644 --- a/src/java/com/android/internal/telephony/cdma/RuimFileHandler.java +++ b/src/java/com/android/internal/telephony/cdma/RuimFileHandler.java @@ -17,7 +17,7 @@ package com.android.internal.telephony.cdma; import android.os.*; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.IccFileHandler; @@ -67,12 +67,12 @@ public final class RuimFileHandler extends IccFileHandler { @Override protected void logd(String msg) { - Log.d(LOG_TAG, "[RuimFileHandler] " + msg); + Rlog.d(LOG_TAG, "[RuimFileHandler] " + msg); } @Override protected void loge(String msg) { - Log.e(LOG_TAG, "[RuimFileHandler] " + msg); + Rlog.e(LOG_TAG, "[RuimFileHandler] " + msg); } } diff --git a/src/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java b/src/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java index e919245c7..c844a0f1d 100644 --- a/src/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java +++ b/src/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java @@ -19,7 +19,7 @@ package com.android.internal.telephony.cdma; import java.util.concurrent.atomic.AtomicBoolean; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.IccFileHandler; import com.android.internal.telephony.IccPhoneBookInterfaceManager; @@ -46,9 +46,9 @@ public class RuimPhoneBookInterfaceManager extends IccPhoneBookInterfaceManager try { super.finalize(); } catch (Throwable throwable) { - Log.e(LOG_TAG, "Error while finalizing:", throwable); + Rlog.e(LOG_TAG, "Error while finalizing:", throwable); } - if(DBG) Log.d(LOG_TAG, "RuimPhoneBookInterfaceManager finalized"); + if(DBG) Rlog.d(LOG_TAG, "RuimPhoneBookInterfaceManager finalized"); } public int[] getAdnRecordsSize(int efid) { @@ -73,11 +73,11 @@ public class RuimPhoneBookInterfaceManager extends IccPhoneBookInterfaceManager } protected void logd(String msg) { - Log.d(LOG_TAG, "[RuimPbInterfaceManager] " + msg); + Rlog.d(LOG_TAG, "[RuimPbInterfaceManager] " + msg); } protected void loge(String msg) { - Log.e(LOG_TAG, "[RuimPbInterfaceManager] " + msg); + Rlog.e(LOG_TAG, "[RuimPbInterfaceManager] " + msg); } } diff --git a/src/java/com/android/internal/telephony/cdma/RuimRecords.java b/src/java/com/android/internal/telephony/cdma/RuimRecords.java index c9b3eb02d..f6576198c 100755 --- a/src/java/com/android/internal/telephony/cdma/RuimRecords.java +++ b/src/java/com/android/internal/telephony/cdma/RuimRecords.java @@ -31,7 +31,7 @@ import android.os.Handler; import android.os.Message; import android.os.Registrant; import android.os.SystemProperties; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.AdnRecord; import com.android.internal.telephony.AdnRecordCache; @@ -523,7 +523,7 @@ public final class RuimRecords extends IccRecords { case EVENT_UPDATE_DONE: ar = (AsyncResult)msg.obj; if (ar.exception != null) { - Log.i(LOG_TAG, "RuimRecords update failed", ar.exception); + Rlog.i(LOG_TAG, "RuimRecords update failed", ar.exception); } break; @@ -531,7 +531,7 @@ public final class RuimRecords extends IccRecords { case EVENT_MARK_SMS_READ_DONE: case EVENT_SMS_ON_RUIM: case EVENT_GET_SMS_DONE: - Log.w(LOG_TAG, "Event not supported: " + msg.what); + Rlog.w(LOG_TAG, "Event not supported: " + msg.what); break; // TODO: probably EF_CST should be read instead @@ -552,7 +552,7 @@ public final class RuimRecords extends IccRecords { }}catch (RuntimeException exc) { // I don't want these exceptions to be fatal - Log.w(LOG_TAG, "Exception parsing RUIM record", exc); + Rlog.w(LOG_TAG, "Exception parsing RUIM record", exc); } finally { // Count up record load responses even if they are fails if (isRecordLoadResponse) { @@ -816,11 +816,11 @@ public final class RuimRecords extends IccRecords { } @Override protected void log(String s) { - Log.d(LOG_TAG, "[RuimRecords] " + s); + Rlog.d(LOG_TAG, "[RuimRecords] " + s); } @Override protected void loge(String s) { - Log.e(LOG_TAG, "[RuimRecords] " + s); + Rlog.e(LOG_TAG, "[RuimRecords] " + s); } } diff --git a/src/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java b/src/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java index 9cd059d3e..f170b945b 100644 --- a/src/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java +++ b/src/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java @@ -21,7 +21,7 @@ import android.content.Context; import android.os.AsyncResult; import android.os.Handler; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.IccConstants; import com.android.internal.telephony.IccSmsInterfaceManager; @@ -93,9 +93,9 @@ public class RuimSmsInterfaceManager extends IccSmsInterfaceManager { try { super.finalize(); } catch (Throwable throwable) { - Log.e(LOG_TAG, "Error while finalizing:", throwable); + Rlog.e(LOG_TAG, "Error while finalizing:", throwable); } - if(DBG) Log.d(LOG_TAG, "RuimSmsInterfaceManager finalized"); + if(DBG) Rlog.d(LOG_TAG, "RuimSmsInterfaceManager finalized"); } /** @@ -193,30 +193,30 @@ public class RuimSmsInterfaceManager extends IccSmsInterfaceManager { public boolean enableCellBroadcast(int messageIdentifier) { // Not implemented - Log.e(LOG_TAG, "Error! Not implemented for CDMA."); + Rlog.e(LOG_TAG, "Error! Not implemented for CDMA."); return false; } public boolean disableCellBroadcast(int messageIdentifier) { // Not implemented - Log.e(LOG_TAG, "Error! Not implemented for CDMA."); + Rlog.e(LOG_TAG, "Error! Not implemented for CDMA."); return false; } public boolean enableCellBroadcastRange(int startMessageId, int endMessageId) { // Not implemented - Log.e(LOG_TAG, "Error! Not implemented for CDMA."); + Rlog.e(LOG_TAG, "Error! Not implemented for CDMA."); return false; } public boolean disableCellBroadcastRange(int startMessageId, int endMessageId) { // Not implemented - Log.e(LOG_TAG, "Error! Not implemented for CDMA."); + Rlog.e(LOG_TAG, "Error! Not implemented for CDMA."); return false; } protected void log(String msg) { - Log.d(LOG_TAG, "[RuimSmsInterfaceManager] " + msg); + Rlog.d(LOG_TAG, "[RuimSmsInterfaceManager] " + msg); } } diff --git a/src/java/com/android/internal/telephony/cdma/SignalToneUtil.java b/src/java/com/android/internal/telephony/cdma/SignalToneUtil.java index a149e7225..5fedc5261 100644 --- a/src/java/com/android/internal/telephony/cdma/SignalToneUtil.java +++ b/src/java/com/android/internal/telephony/cdma/SignalToneUtil.java @@ -18,7 +18,7 @@ package com.android.internal.telephony.cdma; import java.util.HashMap; import java.util.HashSet; -import android.util.Log; +import android.telephony.Rlog; import android.media.ToneGenerator; public class SignalToneUtil { diff --git a/src/java/com/android/internal/telephony/cdma/SmsMessage.java b/src/java/com/android/internal/telephony/cdma/SmsMessage.java index 617a3289c..f536a602f 100644 --- a/src/java/com/android/internal/telephony/cdma/SmsMessage.java +++ b/src/java/com/android/internal/telephony/cdma/SmsMessage.java @@ -22,6 +22,7 @@ import android.telephony.PhoneNumberUtils; import android.telephony.SmsCbLocation; import android.telephony.SmsCbMessage; import android.telephony.cdma.CdmaSmsCbProgramData; +import android.telephony.Rlog; import android.util.Log; import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails; @@ -110,7 +111,7 @@ public class SmsMessage extends SmsMessageBase { msg.parsePdu(pdu); return msg; } catch (RuntimeException ex) { - Log.e(LOG_TAG, "SMS PDU parsing failed: ", ex); + Rlog.e(LOG_TAG, "SMS PDU parsing failed: ", ex); return null; } } @@ -237,7 +238,7 @@ public class SmsMessage extends SmsMessageBase { // or STORED_UNSENT // See 3GPP2 C.S0023 3.4.27 if ((data[0] & 1) == 0) { - Log.w(LOG_TAG, "SMS parsing failed: Trying to parse a free record"); + Rlog.w(LOG_TAG, "SMS parsing failed: Trying to parse a free record"); return null; } else { msg.statusOnIcc = data[0] & 0x07; @@ -256,7 +257,7 @@ public class SmsMessage extends SmsMessageBase { msg.parsePduFromEfRecord(pdu); return msg; } catch (RuntimeException ex) { - Log.e(LOG_TAG, "SMS PDU parsing failed: ", ex); + Rlog.e(LOG_TAG, "SMS PDU parsing failed: ", ex); return null; } @@ -266,7 +267,7 @@ public class SmsMessage extends SmsMessageBase { * Note: This function is a GSM specific functionality which is not supported in CDMA mode. */ public static int getTPLayerLengthForPDU(String pdu) { - Log.w(LOG_TAG, "getTPLayerLengthForPDU: is not supported in CDMA mode."); + Rlog.w(LOG_TAG, "getTPLayerLengthForPDU: is not supported in CDMA mode."); return 0; } @@ -369,7 +370,7 @@ public class SmsMessage extends SmsMessageBase { * Note: This function is a GSM specific functionality which is not supported in CDMA mode. */ public int getProtocolIdentifier() { - Log.w(LOG_TAG, "getProtocolIdentifier: is not supported in CDMA mode."); + Rlog.w(LOG_TAG, "getProtocolIdentifier: is not supported in CDMA mode."); // (3GPP TS 23.040): "no interworking, but SME to SME protocol": return 0; } @@ -378,7 +379,7 @@ public class SmsMessage extends SmsMessageBase { * Note: This function is a GSM specific functionality which is not supported in CDMA mode. */ public boolean isReplace() { - Log.w(LOG_TAG, "isReplace: is not supported in CDMA mode."); + Rlog.w(LOG_TAG, "isReplace: is not supported in CDMA mode."); return false; } @@ -387,7 +388,7 @@ public class SmsMessage extends SmsMessageBase { * Note: This function is a GSM specific functionality which is not supported in CDMA mode. */ public boolean isCphsMwiMessage() { - Log.w(LOG_TAG, "isCphsMwiMessage: is not supported in CDMA mode."); + Rlog.w(LOG_TAG, "isCphsMwiMessage: is not supported in CDMA mode."); return false; } @@ -432,7 +433,7 @@ public class SmsMessage extends SmsMessageBase { * Note: This function is a GSM specific functionality which is not supported in CDMA mode. */ public boolean isReplyPathPresent() { - Log.w(LOG_TAG, "isReplyPathPresent: is not supported in CDMA mode."); + Rlog.w(LOG_TAG, "isReplyPathPresent: is not supported in CDMA mode."); return false; } @@ -519,7 +520,7 @@ public class SmsMessage extends SmsMessageBase { dis.read(env.bearerData, 0, bearerDataLength); dis.close(); } catch (Exception ex) { - Log.e(LOG_TAG, "createFromPdu: conversion from byte array to object failed: " + ex); + Rlog.e(LOG_TAG, "createFromPdu: conversion from byte array to object failed: " + ex); } // link the filled objects to this SMS @@ -557,7 +558,7 @@ public class SmsMessage extends SmsMessageBase { * this message */ env.teleService = dis.readUnsignedShort(); - Log.i(LOG_TAG, "teleservice = " + env.teleService); + Rlog.i(LOG_TAG, "teleservice = " + env.teleService); break; case SERVICE_CATEGORY: /* @@ -603,18 +604,18 @@ public class SmsMessage extends SmsMessageBase { } else if (addr.numberMode == CdmaSmsAddress.NUMBER_MODE_DATA_NETWORK) { if (numberType == 2) - Log.e(LOG_TAG, "TODO: Originating Addr is email id"); + Rlog.e(LOG_TAG, "TODO: Originating Addr is email id"); else - Log.e(LOG_TAG, + Rlog.e(LOG_TAG, "TODO: Originating Addr is data network address"); } else { - Log.e(LOG_TAG, "Originating Addr is of incorrect type"); + Rlog.e(LOG_TAG, "Originating Addr is of incorrect type"); } } else { - Log.e(LOG_TAG, "Incorrect Digit mode"); + Rlog.e(LOG_TAG, "Incorrect Digit mode"); } addr.origBytes = data; - Log.i(LOG_TAG, "Originating Addr=" + addr.toString()); + Rlog.i(LOG_TAG, "Originating Addr=" + addr.toString()); break; case ORIGINATING_SUB_ADDRESS: case DESTINATION_SUB_ADDRESS: @@ -655,7 +656,7 @@ public class SmsMessage extends SmsMessageBase { bais.close(); dis.close(); } catch (Exception ex) { - Log.e(LOG_TAG, "parsePduFromEfRecord: conversion from pdu to SmsMessage failed" + ex); + Rlog.e(LOG_TAG, "parsePduFromEfRecord: conversion from pdu to SmsMessage failed" + ex); } // link the filled objects to this SMS @@ -680,16 +681,16 @@ public class SmsMessage extends SmsMessageBase { mBearerData.numberOfMessages = 0x000000FF & mEnvelope.bearerData[0]; } if (false) { - Log.d(LOG_TAG, "parseSms: get MWI " + + Rlog.d(LOG_TAG, "parseSms: get MWI " + Integer.toString(mBearerData.numberOfMessages)); } return; } mBearerData = BearerData.decode(mEnvelope.bearerData); - if (Log.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) { - Log.d(LOG_TAG, "MT raw BearerData = '" + + if (Rlog.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) { + Rlog.d(LOG_TAG, "MT raw BearerData = '" + HexDump.toHexString(mEnvelope.bearerData) + "'"); - Log.d(LOG_TAG, "MT (decoded) BearerData = " + mBearerData); + Rlog.d(LOG_TAG, "MT (decoded) BearerData = " + mBearerData); } messageRef = mBearerData.messageId; if (mBearerData.userData != null) { @@ -700,7 +701,7 @@ public class SmsMessage extends SmsMessageBase { if (originatingAddress != null) { originatingAddress.address = new String(originatingAddress.origBytes); - if (false) Log.v(LOG_TAG, "SMS originating address: " + if (false) Rlog.v(LOG_TAG, "SMS originating address: " + originatingAddress.address); } @@ -708,7 +709,7 @@ public class SmsMessage extends SmsMessageBase { scTimeMillis = mBearerData.msgCenterTimeStamp.toMillis(true); } - if (false) Log.d(LOG_TAG, "SMS SC timestamp: " + scTimeMillis); + if (false) Rlog.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) { @@ -720,7 +721,7 @@ public class SmsMessage extends SmsMessageBase { // message without this subparameter is assumed to // indicate successful delivery (status == 0). if (! mBearerData.messageStatusSet) { - Log.d(LOG_TAG, "DELIVERY_ACK message without msgStatus (" + + Rlog.d(LOG_TAG, "DELIVERY_ACK message without msgStatus (" + (userData == null ? "also missing" : "does have") + " userData)."); status = 0; @@ -733,10 +734,10 @@ public class SmsMessage extends SmsMessageBase { } if (messageBody != null) { - if (false) Log.v(LOG_TAG, "SMS message body: '" + messageBody + "'"); + if (false) Rlog.v(LOG_TAG, "SMS message body: '" + messageBody + "'"); parseMessageBody(); } else if ((userData != null) && (false)) { - Log.v(LOG_TAG, "SMS payload: '" + IccUtils.bytesToHexString(userData) + "'"); + Rlog.v(LOG_TAG, "SMS payload: '" + IccUtils.bytesToHexString(userData) + "'"); } } @@ -746,12 +747,12 @@ public class SmsMessage extends SmsMessageBase { SmsCbMessage parseBroadcastSms() { BearerData bData = BearerData.decode(mEnvelope.bearerData, mEnvelope.serviceCategory); if (bData == null) { - Log.w(LOG_TAG, "BearerData.decode() returned null"); + Rlog.w(LOG_TAG, "BearerData.decode() returned null"); return null; } - if (Log.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) { - Log.d(LOG_TAG, "MT raw BearerData = " + HexDump.toHexString(mEnvelope.bearerData)); + if (Rlog.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) { + Rlog.d(LOG_TAG, "MT raw BearerData = " + HexDump.toHexString(mEnvelope.bearerData)); } String plmn = SystemProperties.get(TelephonyProperties.PROPERTY_OPERATOR_NUMERIC); @@ -791,9 +792,9 @@ public class SmsMessage extends SmsMessageBase { int msgId = SystemProperties.getInt(TelephonyProperties.PROPERTY_CDMA_MSG_ID, 1); String nextMsgId = Integer.toString((msgId % 0xFFFF) + 1); SystemProperties.set(TelephonyProperties.PROPERTY_CDMA_MSG_ID, nextMsgId); - if (Log.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) { - Log.d(LOG_TAG, "next " + TelephonyProperties.PROPERTY_CDMA_MSG_ID + " = " + nextMsgId); - Log.d(LOG_TAG, "readback gets " + + if (Rlog.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) { + Rlog.d(LOG_TAG, "next " + TelephonyProperties.PROPERTY_CDMA_MSG_ID + " = " + nextMsgId); + Rlog.d(LOG_TAG, "readback gets " + SystemProperties.get(TelephonyProperties.PROPERTY_CDMA_MSG_ID)); } return msgId; @@ -837,9 +838,9 @@ public class SmsMessage extends SmsMessageBase { bearerData.userData = userData; byte[] encodedBearerData = BearerData.encode(bearerData); - if (Log.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) { - Log.d(LOG_TAG, "MO (encoded) BearerData = " + bearerData); - Log.d(LOG_TAG, "MO raw BearerData = '" + HexDump.toHexString(encodedBearerData) + "'"); + if (Rlog.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) { + Rlog.d(LOG_TAG, "MO (encoded) BearerData = " + bearerData); + Rlog.d(LOG_TAG, "MO raw BearerData = '" + HexDump.toHexString(encodedBearerData) + "'"); } if (encodedBearerData == null) return null; @@ -887,7 +888,7 @@ public class SmsMessage extends SmsMessageBase { pdu.encodedScAddress = null; return pdu; } catch(IOException ex) { - Log.e(LOG_TAG, "creating SubmitPdu failed: " + ex); + Rlog.e(LOG_TAG, "creating SubmitPdu failed: " + ex); } return null; } @@ -934,7 +935,7 @@ public class SmsMessage extends SmsMessageBase { mPdu = baos.toByteArray(); } catch (IOException ex) { - Log.e(LOG_TAG, "createPdu: conversion from object to byte array failed: " + ex); + Rlog.e(LOG_TAG, "createPdu: conversion from object to byte array failed: " + ex); } } diff --git a/src/java/com/android/internal/telephony/cdma/sms/BearerData.java b/src/java/com/android/internal/telephony/cdma/sms/BearerData.java index d40242cef..35538f635 100644 --- a/src/java/com/android/internal/telephony/cdma/sms/BearerData.java +++ b/src/java/com/android/internal/telephony/cdma/sms/BearerData.java @@ -21,7 +21,7 @@ import android.telephony.SmsCbCmasInfo; import android.telephony.cdma.CdmaSmsCbProgramData; import android.telephony.cdma.CdmaSmsCbProgramResults; import android.text.format.Time; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.GsmAlphabet; import com.android.internal.telephony.IccUtils; @@ -627,7 +627,7 @@ public final class BearerData { throws CodingException { if ((uData.payloadStr == null) && (uData.msgEncoding != UserData.ENCODING_OCTET)) { - Log.e(LOG_TAG, "user data with null payloadStr"); + Rlog.e(LOG_TAG, "user data with null payloadStr"); uData.payloadStr = ""; } @@ -639,7 +639,7 @@ public final class BearerData { if (uData.msgEncodingSet) { if (uData.msgEncoding == UserData.ENCODING_OCTET) { if (uData.payload == null) { - Log.e(LOG_TAG, "user data with octet encoding but null payload"); + Rlog.e(LOG_TAG, "user data with octet encoding but null payload"); uData.payload = new byte[0]; uData.numFields = 0; } else { @@ -647,7 +647,7 @@ public final class BearerData { } } else { if (uData.payloadStr == null) { - Log.e(LOG_TAG, "non-octet user data with null payloadStr"); + Rlog.e(LOG_TAG, "non-octet user data with null payloadStr"); uData.payloadStr = ""; } if (uData.msgEncoding == UserData.ENCODING_GSM_7BIT_ALPHABET) { @@ -937,9 +937,9 @@ public final class BearerData { } return outStream.toByteArray(); } catch (BitwiseOutputStream.AccessException ex) { - Log.e(LOG_TAG, "BearerData encode failed: " + ex); + Rlog.e(LOG_TAG, "BearerData encode failed: " + ex); } catch (CodingException ex) { - Log.e(LOG_TAG, "BearerData encode failed: " + ex); + Rlog.e(LOG_TAG, "BearerData encode failed: " + ex); } return null; } @@ -960,7 +960,7 @@ public final class BearerData { inStream.skip(3); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "MESSAGE_IDENTIFIER decode " + + Rlog.d(LOG_TAG, "MESSAGE_IDENTIFIER decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1014,7 +1014,7 @@ public final class BearerData { if (maxNumFields < 0) { throw new CodingException(charset + " decode failed: offset out of range"); } - Log.e(LOG_TAG, charset + " decode error: offset = " + offset + " numFields = " + Rlog.e(LOG_TAG, charset + " decode error: offset = " + offset + " numFields = " + numFields + " data.length = " + data.length + " maxNumFields = " + maxNumFields); numFields = maxNumFields; @@ -1271,7 +1271,7 @@ public final class BearerData { inStream.skip(4); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "REPLY_OPTION decode " + + Rlog.d(LOG_TAG, "REPLY_OPTION decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1291,7 +1291,7 @@ public final class BearerData { bData.numberOfMessages = IccUtils.cdmaBcdByteToInt((byte)inStream.read(8)); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "NUMBER_OF_MESSAGES decode " + + Rlog.d(LOG_TAG, "NUMBER_OF_MESSAGES decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1311,7 +1311,7 @@ public final class BearerData { bData.depositIndex = (inStream.read(8) << 8) | inStream.read(8); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "MESSAGE_DEPOSIT_INDEX decode " + + Rlog.d(LOG_TAG, "MESSAGE_DEPOSIT_INDEX decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1394,7 +1394,7 @@ public final class BearerData { bData.messageStatus = inStream.read(6); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "MESSAGE_STATUS decode " + + Rlog.d(LOG_TAG, "MESSAGE_STATUS decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1415,7 +1415,7 @@ public final class BearerData { bData.msgCenterTimeStamp = TimeStamp.fromByteArray(inStream.readByteArray(6 * 8)); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "MESSAGE_CENTER_TIME_STAMP decode " + + Rlog.d(LOG_TAG, "MESSAGE_CENTER_TIME_STAMP decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1435,7 +1435,7 @@ public final class BearerData { bData.validityPeriodAbsolute = TimeStamp.fromByteArray(inStream.readByteArray(6 * 8)); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "VALIDITY_PERIOD_ABSOLUTE decode " + + Rlog.d(LOG_TAG, "VALIDITY_PERIOD_ABSOLUTE decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1456,7 +1456,7 @@ public final class BearerData { inStream.readByteArray(6 * 8)); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "DEFERRED_DELIVERY_TIME_ABSOLUTE decode " + + Rlog.d(LOG_TAG, "DEFERRED_DELIVERY_TIME_ABSOLUTE decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1476,7 +1476,7 @@ public final class BearerData { bData.deferredDeliveryTimeRelative = inStream.read(8); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "VALIDITY_PERIOD_RELATIVE decode " + + Rlog.d(LOG_TAG, "VALIDITY_PERIOD_RELATIVE decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1497,7 +1497,7 @@ public final class BearerData { bData.validityPeriodRelative = inStream.read(8); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "DEFERRED_DELIVERY_TIME_RELATIVE decode " + + Rlog.d(LOG_TAG, "DEFERRED_DELIVERY_TIME_RELATIVE decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1519,7 +1519,7 @@ public final class BearerData { inStream.skip(6); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "PRIVACY_INDICATOR decode " + + Rlog.d(LOG_TAG, "PRIVACY_INDICATOR decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1540,7 +1540,7 @@ public final class BearerData { bData.language = inStream.read(8); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "LANGUAGE_INDICATOR decode " + + Rlog.d(LOG_TAG, "LANGUAGE_INDICATOR decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1562,7 +1562,7 @@ public final class BearerData { inStream.skip(6); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "DISPLAY_MODE decode " + + Rlog.d(LOG_TAG, "DISPLAY_MODE decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1584,7 +1584,7 @@ public final class BearerData { inStream.skip(6); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "PRIORITY_INDICATOR decode " + + Rlog.d(LOG_TAG, "PRIORITY_INDICATOR decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1606,7 +1606,7 @@ public final class BearerData { inStream.skip(6); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "ALERT_ON_MESSAGE_DELIVERY decode " + + Rlog.d(LOG_TAG, "ALERT_ON_MESSAGE_DELIVERY decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1627,7 +1627,7 @@ public final class BearerData { bData.userResponseCode = inStream.read(8); } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "USER_RESPONSE_CODE decode " + + Rlog.d(LOG_TAG, "USER_RESPONSE_CODE decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ")"); } @@ -1689,7 +1689,7 @@ public final class BearerData { } if ((! decodeSuccess) || (paramBits > 0)) { - Log.d(LOG_TAG, "SERVICE_CATEGORY_PROGRAM_DATA decode " + + Rlog.d(LOG_TAG, "SERVICE_CATEGORY_PROGRAM_DATA decode " + (decodeSuccess ? "succeeded" : "failed") + " (extra bits = " + paramBits + ')'); } @@ -1823,7 +1823,7 @@ public final class BearerData { break; default: - Log.w(LOG_TAG, "skipping unsupported CMAS record type " + recordType); + Rlog.w(LOG_TAG, "skipping unsupported CMAS record type " + recordType); inStream.skip(recordLen * 8); break; } @@ -1945,7 +1945,7 @@ public final class BearerData { (1 << SUBPARAM_MESSAGE_IDENTIFIER) ^ (1 << SUBPARAM_USER_DATA)) != 0) { - Log.e(LOG_TAG, "IS-91 must occur without extra subparams (" + + Rlog.e(LOG_TAG, "IS-91 must occur without extra subparams (" + foundSubparamMask + ")"); } decodeIs91(bData); @@ -1955,9 +1955,9 @@ public final class BearerData { } return bData; } catch (BitwiseInputStream.AccessException ex) { - Log.e(LOG_TAG, "BearerData decode failed: " + ex); + Rlog.e(LOG_TAG, "BearerData decode failed: " + ex); } catch (CodingException ex) { - Log.e(LOG_TAG, "BearerData decode failed: " + ex); + Rlog.e(LOG_TAG, "BearerData decode failed: " + ex); } return null; } diff --git a/src/java/com/android/internal/telephony/gsm/GSMPhone.java b/src/java/com/android/internal/telephony/gsm/GSMPhone.java index 5b58edad0..97213eb0e 100644 --- a/src/java/com/android/internal/telephony/gsm/GSMPhone.java +++ b/src/java/com/android/internal/telephony/gsm/GSMPhone.java @@ -35,7 +35,7 @@ import android.telephony.ServiceState; import android.telephony.SignalStrength; import com.android.internal.telephony.CallTracker; import android.text.TextUtils; -import android.util.Log; +import android.telephony.Rlog; import static com.android.internal.telephony.CommandsInterface.CF_ACTION_DISABLE; import static com.android.internal.telephony.CommandsInterface.CF_ACTION_ENABLE; @@ -176,11 +176,11 @@ public class GSMPhone extends PhoneBase { try { Socket sock; sock = debugSocket.accept(); - Log.i(LOG_TAG, "New connection; resetting radio"); + Rlog.i(LOG_TAG, "New connection; resetting radio"); mCM.resetRadio(null); sock.close(); } catch (IOException ex) { - Log.w(LOG_TAG, + Rlog.w(LOG_TAG, "Exception accepting socket", ex); } } @@ -191,7 +191,7 @@ public class GSMPhone extends PhoneBase { debugPortThread.start(); } catch (IOException ex) { - Log.w(LOG_TAG, "Failure to open com.android.internal.telephony.debug socket", ex); + Rlog.w(LOG_TAG, "Failure to open com.android.internal.telephony.debug socket", ex); } } @@ -228,7 +228,7 @@ public class GSMPhone extends PhoneBase { @Override public void removeReferences() { - Log.d(LOG_TAG, "removeReferences"); + Rlog.d(LOG_TAG, "removeReferences"); mSimulatedRadioControl = null; mSimPhoneBookIntManager = null; mSimSmsIntManager = null; @@ -239,7 +239,7 @@ public class GSMPhone extends PhoneBase { } protected void finalize() { - if(LOCAL_DEBUG) Log.d(LOG_TAG, "GSMPhone finalized"); + if(LOCAL_DEBUG) Rlog.d(LOG_TAG, "GSMPhone finalized"); } @@ -481,16 +481,16 @@ public class GSMPhone extends PhoneBase { } if (getRingingCall().getState() != GsmCall.State.IDLE) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, "MmiCode 0: rejectCall"); + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "MmiCode 0: rejectCall"); try { mCT.rejectCall(); } catch (CallStateException e) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "reject failed", e); notifySuppServiceFailed(Phone.SuppService.REJECT); } } else if (getBackgroundCall().getState() != GsmCall.State.IDLE) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "MmiCode 0: hangupWaitingOrBackground"); mCT.hangupWaitingOrBackground(); } @@ -514,25 +514,25 @@ public class GSMPhone extends PhoneBase { int callIndex = ch - '0'; if (callIndex >= 1 && callIndex <= GsmCallTracker.MAX_CONNECTIONS) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "MmiCode 1: hangupConnectionByIndex " + callIndex); mCT.hangupConnectionByIndex(call, callIndex); } } else { if (call.getState() != GsmCall.State.IDLE) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "MmiCode 1: hangup foreground"); //mCT.hangupForegroundResumeBackground(); mCT.hangup(call); } else { - if (LOCAL_DEBUG) Log.d(LOG_TAG, + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "MmiCode 1: switchWaitingOrHoldingAndActive"); mCT.switchWaitingOrHoldingAndActive(); } } } catch (CallStateException e) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "hangup failed", e); notifySuppServiceFailed(Phone.SuppService.HANGUP); } @@ -558,32 +558,32 @@ public class GSMPhone extends PhoneBase { // gsm index starts at 1, up to 5 connections in a call, if (conn != null && callIndex >= 1 && callIndex <= GsmCallTracker.MAX_CONNECTIONS) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, "MmiCode 2: separate call "+ + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "MmiCode 2: separate call "+ callIndex); mCT.separate(conn); } else { - if (LOCAL_DEBUG) Log.d(LOG_TAG, "separate: invalid call index "+ + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "separate: invalid call index "+ callIndex); notifySuppServiceFailed(Phone.SuppService.SEPARATE); } } catch (CallStateException e) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "separate failed", e); notifySuppServiceFailed(Phone.SuppService.SEPARATE); } } else { try { if (getRingingCall().getState() != GsmCall.State.IDLE) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "MmiCode 2: accept ringing call"); mCT.acceptCall(); } else { - if (LOCAL_DEBUG) Log.d(LOG_TAG, + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "MmiCode 2: switchWaitingOrHoldingAndActive"); mCT.switchWaitingOrHoldingAndActive(); } } catch (CallStateException e) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "switch failed", e); notifySuppServiceFailed(Phone.SuppService.SWITCH); } @@ -598,11 +598,11 @@ public class GSMPhone extends PhoneBase { return false; } - if (LOCAL_DEBUG) Log.d(LOG_TAG, "MmiCode 3: merge calls"); + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "MmiCode 3: merge calls"); try { conference(); } catch (CallStateException e) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "conference failed", e); notifySuppServiceFailed(Phone.SuppService.CONFERENCE); } @@ -618,11 +618,11 @@ public class GSMPhone extends PhoneBase { return false; } - if (LOCAL_DEBUG) Log.d(LOG_TAG, "MmiCode 4: explicit call transfer"); + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "MmiCode 4: explicit call transfer"); try { explicitCallTransfer(); } catch (CallStateException e) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "transfer failed", e); notifySuppServiceFailed(Phone.SuppService.TRANSFER); } @@ -635,7 +635,7 @@ public class GSMPhone extends PhoneBase { return false; } - Log.i(LOG_TAG, "MmiCode 5: CCBS not supported!"); + Rlog.i(LOG_TAG, "MmiCode 5: CCBS not supported!"); // Treat it as an "unknown" service. notifySuppServiceFailed(Phone.SuppService.UNKNOWN); return true; @@ -710,7 +710,7 @@ public class GSMPhone extends PhoneBase { String networkPortion = PhoneNumberUtils.extractNetworkPortionAlt(newDialString); GsmMmiCode mmi = GsmMmiCode.newFromDialString(networkPortion, this, mUiccApplication.get()); - if (LOCAL_DEBUG) Log.d(LOG_TAG, + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "dialing w/ mmi '" + mmi + "'..."); if (mmi == null) { @@ -750,7 +750,7 @@ public class GSMPhone extends PhoneBase { public void sendDtmf(char c) { if (!PhoneNumberUtils.is12Key(c)) { - Log.e(LOG_TAG, + Rlog.e(LOG_TAG, "sendDtmf called with invalid character '" + c + "'"); } else { if (mCT.state == PhoneConstants.State.OFFHOOK) { @@ -762,7 +762,7 @@ public class GSMPhone extends PhoneBase { public void startDtmf(char c) { if (!PhoneNumberUtils.is12Key(c)) { - Log.e(LOG_TAG, + Rlog.e(LOG_TAG, "startDtmf called with invalid character '" + c + "'"); } else { mCM.startDtmf(c, null); @@ -776,7 +776,7 @@ public class GSMPhone extends PhoneBase { public void sendBurstDtmf(String dtmfString) { - Log.e(LOG_TAG, "[GSMPhone] sendBurstDtmf() is a CDMA method"); + Rlog.e(LOG_TAG, "[GSMPhone] sendBurstDtmf() is a CDMA method"); } public void @@ -842,12 +842,12 @@ public class GSMPhone extends PhoneBase { } public String getEsn() { - Log.e(LOG_TAG, "[GSMPhone] getEsn() is a CDMA method"); + Rlog.e(LOG_TAG, "[GSMPhone] getEsn() is a CDMA method"); return "0"; } public String getMeid() { - Log.e(LOG_TAG, "[GSMPhone] getMeid() is a CDMA method"); + Rlog.e(LOG_TAG, "[GSMPhone] getMeid() is a CDMA method"); return "0"; } @@ -924,7 +924,7 @@ public class GSMPhone extends PhoneBase { public void getCallForwardingOption(int commandInterfaceCFReason, Message onComplete) { if (isValidCommandInterfaceCFReason(commandInterfaceCFReason)) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, "requesting call forwarding query."); + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "requesting call forwarding query."); Message resp; if (commandInterfaceCFReason == CF_REASON_UNCONDITIONAL) { resp = obtainMessage(EVENT_GET_CALL_FORWARD_DONE, onComplete); @@ -1009,7 +1009,7 @@ public class GSMPhone extends PhoneBase { // get the message Message msg = obtainMessage(EVENT_SET_NETWORK_AUTOMATIC_COMPLETE, nsm); if (LOCAL_DEBUG) - Log.d(LOG_TAG, "wrapping and sending message to connect automatically"); + Rlog.d(LOG_TAG, "wrapping and sending message to connect automatically"); mCM.setNetworkSelectionModeAutomatic(msg); } @@ -1199,7 +1199,7 @@ public class GSMPhone extends PhoneBase { break; } - if (LOCAL_DEBUG) Log.d(LOG_TAG, "Baseband version: " + ar.result); + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "Baseband version: " + ar.result); setSystemProperty(PROPERTY_BASEBAND_VERSION, (String)ar.result); break; @@ -1232,7 +1232,7 @@ public class GSMPhone extends PhoneBase { try { onIncomingUSSD(Integer.parseInt(ussdResult[0]), ussdResult[1]); } catch (NumberFormatException e) { - Log.w(LOG_TAG, "error parsing USSD"); + Rlog.w(LOG_TAG, "error parsing USSD"); } } break; @@ -1389,7 +1389,7 @@ public class GSMPhone extends PhoneBase { mContext.getContentResolver().insert(uri, map); return true; } catch (SQLException e) { - Log.e(LOG_TAG, "Can't store current operator", e); + Rlog.e(LOG_TAG, "Can't store current operator", e); } } return false; @@ -1402,7 +1402,7 @@ public class GSMPhone extends PhoneBase { // look for our wrapper within the asyncresult, skip the rest if it // is null. if (!(ar.userObj instanceof NetworkSelectMessage)) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, "unexpected result from user object."); + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "unexpected result from user object."); return; } @@ -1411,7 +1411,7 @@ public class GSMPhone extends PhoneBase { // found the object, now we send off the message we had originally // attached to the request. if (nsm.message != null) { - if (LOCAL_DEBUG) Log.d(LOG_TAG, "sending original message to recipient"); + if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "sending original message to recipient"); AsyncResult.forMessage(nsm.message, ar.result, ar.exception); nsm.message.sendToTarget(); } @@ -1425,7 +1425,7 @@ public class GSMPhone extends PhoneBase { // commit and log the result. if (! editor.commit()) { - Log.e(LOG_TAG, "failed to commit network selection preference"); + Rlog.e(LOG_TAG, "failed to commit network selection preference"); } } @@ -1442,7 +1442,7 @@ public class GSMPhone extends PhoneBase { // commit and log the result. if (! editor.commit()) { - Log.e(LOG_TAG, "failed to commit CLIR preference"); + Rlog.e(LOG_TAG, "failed to commit CLIR preference"); } } @@ -1493,7 +1493,7 @@ public class GSMPhone extends PhoneBase { * @param response Callback message is empty on completion */ public void activateCellBroadcastSms(int activate, Message response) { - Log.e(LOG_TAG, "[GSMPhone] activateCellBroadcastSms() is obsolete; use SmsManager"); + Rlog.e(LOG_TAG, "[GSMPhone] activateCellBroadcastSms() is obsolete; use SmsManager"); response.sendToTarget(); } @@ -1503,7 +1503,7 @@ public class GSMPhone extends PhoneBase { * @param response Callback message is empty on completion */ public void getCellBroadcastSmsConfig(Message response) { - Log.e(LOG_TAG, "[GSMPhone] getCellBroadcastSmsConfig() is obsolete; use SmsManager"); + Rlog.e(LOG_TAG, "[GSMPhone] getCellBroadcastSmsConfig() is obsolete; use SmsManager"); response.sendToTarget(); } @@ -1513,7 +1513,7 @@ public class GSMPhone extends PhoneBase { * @param response Callback message is empty on completion */ public void setCellBroadcastSmsConfig(int[] configValuesArray, Message response) { - Log.e(LOG_TAG, "[GSMPhone] setCellBroadcastSmsConfig() is obsolete; use SmsManager"); + Rlog.e(LOG_TAG, "[GSMPhone] setCellBroadcastSmsConfig() is obsolete; use SmsManager"); response.sendToTarget(); } @@ -1561,6 +1561,6 @@ public class GSMPhone extends PhoneBase { } protected void log(String s) { - Log.d(LOG_TAG, "[GSMPhone] " + s); + Rlog.d(LOG_TAG, "[GSMPhone] " + s); } } diff --git a/src/java/com/android/internal/telephony/gsm/GsmCallTracker.java b/src/java/com/android/internal/telephony/gsm/GsmCallTracker.java index fc7fe8a62..d8a2fcea5 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmCallTracker.java +++ b/src/java/com/android/internal/telephony/gsm/GsmCallTracker.java @@ -27,7 +27,7 @@ import android.telephony.ServiceState; import android.telephony.TelephonyManager; import android.telephony.gsm.GsmCellLocation; import android.util.EventLog; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.CallStateException; import com.android.internal.telephony.CallTracker; @@ -114,21 +114,21 @@ public final class GsmCallTracker extends CallTracker { try { if(c != null) hangup(c); } catch (CallStateException ex) { - Log.e(LOG_TAG, "unexpected error on hangup during dispose"); + Rlog.e(LOG_TAG, "unexpected error on hangup during dispose"); } } try { if(pendingMO != null) hangup(pendingMO); } catch (CallStateException ex) { - Log.e(LOG_TAG, "unexpected error on hangup during dispose"); + Rlog.e(LOG_TAG, "unexpected error on hangup during dispose"); } clearDisconnected(); } protected void finalize() { - Log.d(LOG_TAG, "GsmCallTracker finalized"); + Rlog.d(LOG_TAG, "GsmCallTracker finalized"); } //***** Instance Methods @@ -249,7 +249,7 @@ public final class GsmCallTracker extends CallTracker { // is no longer call waiting if (ringingCall.getState() == GsmCall.State.INCOMING) { - Log.i("phone", "acceptCall: incoming..."); + Rlog.i("phone", "acceptCall: incoming..."); // Always unmute when answering a new call setMute(false); cm.acceptCall(obtainCompleteMessage()); @@ -378,7 +378,7 @@ public final class GsmCallTracker extends CallTracker { cm.getCurrentCalls(lastRelevantPoll); } else if (pendingOperations < 0) { // this should never happen - Log.e(LOG_TAG,"GsmCallTracker.pendingOperations < 0"); + Rlog.e(LOG_TAG,"GsmCallTracker.pendingOperations < 0"); pendingOperations = 0; } } @@ -471,7 +471,7 @@ public final class GsmCallTracker extends CallTracker { "poll: hangupPendingMO, hangup conn " + i); hangup(connections[i]); } catch (CallStateException ex) { - Log.e(LOG_TAG, "unexpected error on hangup"); + Rlog.e(LOG_TAG, "unexpected error on hangup"); } // Do not continue processing this poll @@ -490,7 +490,7 @@ public final class GsmCallTracker extends CallTracker { // Either we've crashed and re-attached to an existing // call, or something else (eg, SIM) initiated the call. - Log.i(LOG_TAG,"Phantom call appeared " + dc); + Rlog.i(LOG_TAG,"Phantom call appeared " + dc); // If it's a connected call, set the connect time so that // it's non-zero. It may not be accurate, but at least @@ -552,7 +552,7 @@ public final class GsmCallTracker extends CallTracker { // We expect the pending call to appear in the list // If it does not, we land here if (pendingMO != null) { - Log.d(LOG_TAG,"Pending MO dropped before poll fg state:" + Rlog.d(LOG_TAG,"Pending MO dropped before poll fg state:" + foregroundCall.getState()); droppedDuringPoll.add(pendingMO); @@ -640,27 +640,27 @@ public final class GsmCallTracker extends CallTracker { dumpState() { List l; - Log.i(LOG_TAG,"Phone State:" + state); + Rlog.i(LOG_TAG,"Phone State:" + state); - Log.i(LOG_TAG,"Ringing call: " + ringingCall.toString()); + Rlog.i(LOG_TAG,"Ringing call: " + ringingCall.toString()); l = ringingCall.getConnections(); for (int i = 0, s = l.size(); i < s; i++) { - Log.i(LOG_TAG,l.get(i).toString()); + Rlog.i(LOG_TAG,l.get(i).toString()); } - Log.i(LOG_TAG,"Foreground call: " + foregroundCall.toString()); + Rlog.i(LOG_TAG,"Foreground call: " + foregroundCall.toString()); l = foregroundCall.getConnections(); for (int i = 0, s = l.size(); i < s; i++) { - Log.i(LOG_TAG,l.get(i).toString()); + Rlog.i(LOG_TAG,l.get(i).toString()); } - Log.i(LOG_TAG,"Background call: " + backgroundCall.toString()); + Rlog.i(LOG_TAG,"Background call: " + backgroundCall.toString()); l = backgroundCall.getConnections(); for (int i = 0, s = l.size(); i < s; i++) { - Log.i(LOG_TAG,l.get(i).toString()); + Rlog.i(LOG_TAG,l.get(i).toString()); } } @@ -686,7 +686,7 @@ public final class GsmCallTracker extends CallTracker { } catch (CallStateException ex) { // Ignore "connection not found" // Call may have hung up already - Log.w(LOG_TAG,"GsmCallTracker WARN: hangup() on absent connection " + Rlog.w(LOG_TAG,"GsmCallTracker WARN: hangup() on absent connection " + conn); } } @@ -706,7 +706,7 @@ public final class GsmCallTracker extends CallTracker { } catch (CallStateException ex) { // Ignore "connection not found" // Call may have hung up already - Log.w(LOG_TAG,"GsmCallTracker WARN: separate() on absent connection " + Rlog.w(LOG_TAG,"GsmCallTracker WARN: separate() on absent connection " + conn); } } @@ -797,7 +797,7 @@ public final class GsmCallTracker extends CallTracker { cm.hangupConnection(cn.getGSMIndex(), obtainCompleteMessage()); } } catch (CallStateException ex) { - Log.e(LOG_TAG, "hangupConnectionByIndex caught " + ex); + Rlog.e(LOG_TAG, "hangupConnectionByIndex caught " + ex); } } @@ -874,7 +874,7 @@ public final class GsmCallTracker extends CallTracker { // An exception occurred...just treat the disconnect // cause as "normal" causeCode = CallFailCause.NORMAL_CLEARING; - Log.i(LOG_TAG, + Rlog.i(LOG_TAG, "Exception during getLastCallFailCause, assuming normal disconnect"); } else { causeCode = ((int[])ar.result)[0]; @@ -923,7 +923,7 @@ public final class GsmCallTracker extends CallTracker { } protected void log(String msg) { - Log.d(LOG_TAG, "[GsmCallTracker] " + msg); + Rlog.d(LOG_TAG, "[GsmCallTracker] " + msg); } @Override diff --git a/src/java/com/android/internal/telephony/gsm/GsmConnection.java b/src/java/com/android/internal/telephony/gsm/GsmConnection.java index 59aa12a6f..5499f2aaf 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmConnection.java +++ b/src/java/com/android/internal/telephony/gsm/GsmConnection.java @@ -23,7 +23,7 @@ import android.os.Message; import android.os.PowerManager; import android.os.Registrant; import android.os.SystemClock; -import android.util.Log; +import android.telephony.Rlog; import android.telephony.PhoneNumberUtils; import android.telephony.ServiceState; import android.text.TextUtils; @@ -266,7 +266,7 @@ public class GsmConnection extends Connection { public void proceedAfterWaitChar() { if (postDialState != PostDialState.WAIT) { - Log.w(LOG_TAG, "GsmConnection.proceedAfterWaitChar(): Expected " + Rlog.w(LOG_TAG, "GsmConnection.proceedAfterWaitChar(): Expected " + "getPostDialState() to be WAIT but was " + postDialState); return; } @@ -278,7 +278,7 @@ public class GsmConnection extends Connection { public void proceedAfterWildChar(String str) { if (postDialState != PostDialState.WILD) { - Log.w(LOG_TAG, "GsmConnection.proceedAfterWaitChar(): Expected " + Rlog.w(LOG_TAG, "GsmConnection.proceedAfterWaitChar(): Expected " + "getPostDialState() to be WILD but was " + postDialState); return; } @@ -422,7 +422,7 @@ public class GsmConnection extends Connection { duration = SystemClock.elapsedRealtime() - connectTimeReal; disconnected = true; - if (false) Log.d(LOG_TAG, + if (false) Rlog.d(LOG_TAG, "[GSMConn] onDisconnect: cause=" + cause); owner.phone.notifyDisconnect(this); @@ -617,7 +617,7 @@ public class GsmConnection extends Connection { * and or onConnectedInOrOut. */ if (mPartialWakeLock.isHeld()) { - Log.e(LOG_TAG, "[GSMConn] UNEXPECTED; mPartialWakeLock is held when finalizing."); + Rlog.e(LOG_TAG, "[GSMConn] UNEXPECTED; mPartialWakeLock is held when finalizing."); } releaseWakeLock(); } @@ -628,7 +628,7 @@ public class GsmConnection extends Connection { Registrant postDialHandler; if (postDialState == PostDialState.CANCELLED) { - //Log.v("GSM", "##### processNextPostDialChar: postDialState == CANCELLED, bail"); + //Rlog.v("GSM", "##### processNextPostDialChar: postDialState == CANCELLED, bail"); return; } @@ -651,7 +651,7 @@ public class GsmConnection extends Connection { // Will call processNextPostDialChar h.obtainMessage(EVENT_NEXT_POST_DIAL).sendToTarget(); // Don't notify application - Log.e("GSM", "processNextPostDialChar: c=" + c + " isn't valid!"); + Rlog.e("GSM", "processNextPostDialChar: c=" + c + " isn't valid!"); return; } } @@ -671,7 +671,7 @@ public class GsmConnection extends Connection { // arg1 is the character that was/is being processed notifyMessage.arg1 = c; - //Log.v("GSM", "##### processNextPostDialChar: send msg to postDialHandler, arg1=" + c); + //Rlog.v("GSM", "##### processNextPostDialChar: send msg to postDialHandler, arg1=" + c); notifyMessage.sendToTarget(); } } @@ -753,7 +753,7 @@ public class GsmConnection extends Connection { } private void log(String msg) { - Log.d(LOG_TAG, "[GSMConn] " + msg); + Rlog.d(LOG_TAG, "[GSMConn] " + msg); } @Override diff --git a/src/java/com/android/internal/telephony/gsm/GsmDataConnection.java b/src/java/com/android/internal/telephony/gsm/GsmDataConnection.java index 2569615cd..c4975647a 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmDataConnection.java +++ b/src/java/com/android/internal/telephony/gsm/GsmDataConnection.java @@ -17,7 +17,7 @@ package com.android.internal.telephony.gsm; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import android.util.Patterns; import android.text.TextUtils; @@ -153,7 +153,7 @@ public class GsmDataConnection extends DataConnection { @Override protected void log(String s) { - Log.d(LOG_TAG, "[" + getName() + "] " + s); + Rlog.d(LOG_TAG, "[" + getName() + "] " + s); } private boolean isIpAddress(String address) { diff --git a/src/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/src/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index f84a7c4fb..623263418 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/src/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -49,7 +49,7 @@ import android.telephony.cdma.CdmaCellLocation; import android.telephony.gsm.GsmCellLocation; import android.text.TextUtils; import android.util.EventLog; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.ApnContext; import com.android.internal.telephony.ApnSetting; @@ -2442,12 +2442,12 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { @Override protected void log(String s) { - Log.d(LOG_TAG, "[GsmDCT] "+ s); + Rlog.d(LOG_TAG, "[GsmDCT] "+ s); } @Override protected void loge(String s) { - Log.e(LOG_TAG, "[GsmDCT] " + s); + Rlog.e(LOG_TAG, "[GsmDCT] " + s); } @Override diff --git a/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java b/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java index 10efdc410..08a8b85ec 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java +++ b/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java @@ -24,7 +24,7 @@ import android.os.*; import android.telephony.PhoneNumberUtils; import android.text.SpannableStringBuilder; import android.text.TextUtils; -import android.util.Log; +import android.telephony.Rlog; import static com.android.internal.telephony.CommandsInterface.*; @@ -476,7 +476,7 @@ public final class GsmMmiCode extends Handler implements MmiCode { static private boolean isTwoDigitShortCode(Context context, String dialString) { - Log.d(LOG_TAG, "isTwoDigitShortCode"); + Rlog.d(LOG_TAG, "isTwoDigitShortCode"); if (dialString == null || dialString.length() != 2) return false; @@ -486,13 +486,13 @@ public final class GsmMmiCode extends Handler implements MmiCode { } for (String dialnumber : sTwoDigitNumberPattern) { - Log.d(LOG_TAG, "Two Digit Number Pattern " + dialnumber); + Rlog.d(LOG_TAG, "Two Digit Number Pattern " + dialnumber); if (dialString.equals(dialnumber)) { - Log.d(LOG_TAG, "Two Digit Number Pattern -true"); + Rlog.d(LOG_TAG, "Two Digit Number Pattern -true"); return true; } } - Log.d(LOG_TAG, "Two Digit Number Pattern -false"); + Rlog.d(LOG_TAG, "Two Digit Number Pattern -false"); return false; } @@ -637,14 +637,14 @@ public final class GsmMmiCode extends Handler implements MmiCode { processCode () { try { if (isShortCode()) { - Log.d(LOG_TAG, "isShortCode"); + Rlog.d(LOG_TAG, "isShortCode"); // These just get treated as USSD. sendUssd(dialingNumber); } else if (dialingNumber != null) { // We should have no dialing numbers here throw new RuntimeException ("Invalid or Unsupported MMI Code"); } else if (sc != null && sc.equals(SC_CLIP)) { - Log.d(LOG_TAG, "is CLIP"); + Rlog.d(LOG_TAG, "is CLIP"); if (isInterrogate()) { phone.mCM.queryCLIP( obtainMessage(EVENT_QUERY_COMPLETE, this)); @@ -652,7 +652,7 @@ public final class GsmMmiCode extends Handler implements MmiCode { throw new RuntimeException ("Invalid or Unsupported MMI Code"); } } else if (sc != null && sc.equals(SC_CLIR)) { - Log.d(LOG_TAG, "is CLIR"); + Rlog.d(LOG_TAG, "is CLIR"); if (isActivate()) { phone.mCM.setCLIR(CommandsInterface.CLIR_INVOCATION, obtainMessage(EVENT_SET_COMPLETE, this)); @@ -666,7 +666,7 @@ public final class GsmMmiCode extends Handler implements MmiCode { throw new RuntimeException ("Invalid or Unsupported MMI Code"); } } else if (isServiceCodeCallForwarding(sc)) { - Log.d(LOG_TAG, "is CF"); + Rlog.d(LOG_TAG, "is CF"); String dialingNumber = sia; int serviceClass = siToServiceClass(sib); @@ -702,7 +702,7 @@ public final class GsmMmiCode extends Handler implements MmiCode { ((cfAction == CommandsInterface.CF_ACTION_ENABLE) || (cfAction == CommandsInterface.CF_ACTION_REGISTRATION)) ? 1 : 0; - Log.d(LOG_TAG, "is CF setCallForward"); + Rlog.d(LOG_TAG, "is CF setCallForward"); phone.mCM.setCallForward(cfAction, reason, serviceClass, dialingNumber, time, obtainMessage( EVENT_SET_CFF_COMPLETE, @@ -957,7 +957,7 @@ public final class GsmMmiCode extends Handler implements MmiCode { if (ar.exception instanceof CommandException) { CommandException.Error err = ((CommandException)(ar.exception)).getCommandError(); if (err == CommandException.Error.FDN_CHECK_FAILURE) { - Log.i(LOG_TAG, "FDN_CHECK_FAILURE"); + Rlog.i(LOG_TAG, "FDN_CHECK_FAILURE"); return context.getText(com.android.internal.R.string.mmiFdnError); } } @@ -1018,7 +1018,7 @@ public final class GsmMmiCode extends Handler implements MmiCode { sb.append(context.getText( com.android.internal.R.string.needPuk2)); } else if (err == CommandException.Error.FDN_CHECK_FAILURE) { - Log.i(LOG_TAG, "FDN_CHECK_FAILURE"); + Rlog.i(LOG_TAG, "FDN_CHECK_FAILURE"); sb.append(context.getText(com.android.internal.R.string.mmiFdnError)); } else { sb.append(context.getText( diff --git a/src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java b/src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java index 9295773d9..16cff84ca 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java +++ b/src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java @@ -30,7 +30,7 @@ import android.telephony.SmsCbLocation; import android.telephony.SmsCbMessage; import android.telephony.SmsManager; import android.telephony.gsm.GsmCellLocation; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.GsmAlphabet; @@ -103,10 +103,10 @@ public final class GsmSMSDispatcher extends SMSDispatcher { case EVENT_WRITE_SMS_COMPLETE: AsyncResult ar = (AsyncResult) msg.obj; if (ar.exception == null) { - Log.d(TAG, "Successfully wrote SMS-PP message to UICC"); + Rlog.d(TAG, "Successfully wrote SMS-PP message to UICC"); mCm.acknowledgeLastIncomingGsmSms(true, 0, null); } else { - Log.d(TAG, "Failed to write SMS-PP message to UICC", ar.exception); + Rlog.d(TAG, "Failed to write SMS-PP message to UICC", ar.exception); mCm.acknowledgeLastIncomingGsmSms(false, CommandsInterface.GSM_SMS_FAIL_CAUSE_UNSPECIFIED_ERROR, null); } @@ -160,7 +160,7 @@ public final class GsmSMSDispatcher extends SMSDispatcher { // If sms is null, means there was a parsing error. if (smsb == null) { - Log.e(TAG, "dispatchMessage: message is null"); + Rlog.e(TAG, "dispatchMessage: message is null"); return Intents.RESULT_SMS_GENERIC_ERROR; } @@ -169,7 +169,7 @@ public final class GsmSMSDispatcher extends SMSDispatcher { if (sms.isTypeZero()) { // As per 3GPP TS 23.040 9.2.3.9, Type Zero messages should not be // Displayed/Stored/Notified. They should only be acknowledged. - Log.d(TAG, "Received short message type 0, Don't display or store it. Send Ack"); + Rlog.d(TAG, "Received short message type 0, Don't display or store it. Send Ack"); return Intents.RESULT_SMS_HANDLED; } @@ -182,10 +182,10 @@ public final class GsmSMSDispatcher extends SMSDispatcher { // records have been loaded, after the USIM service table has been loaded. if (ust != null && ust.isAvailable( UsimServiceTable.UsimService.DATA_DL_VIA_SMS_PP)) { - Log.d(TAG, "Received SMS-PP data download, sending to UICC."); + Rlog.d(TAG, "Received SMS-PP data download, sending to UICC."); return mDataDownloadHandler.startDataDownload(sms); } else { - Log.d(TAG, "DATA_DL_VIA_SMS_PP service not available, storing message to UICC."); + Rlog.d(TAG, "DATA_DL_VIA_SMS_PP service not available, storing message to UICC."); String smsc = IccUtils.bytesToHexString( PhoneNumberUtils.networkPortionToCalledPartyBCDWithLength( sms.getServiceCenterAddress())); @@ -198,7 +198,7 @@ public final class GsmSMSDispatcher extends SMSDispatcher { if (mSmsReceiveDisabled) { // Device doesn't support SMS service, - Log.d(TAG, "Received short message on device which doesn't support " + Rlog.d(TAG, "Received short message on device which doesn't support " + "SMS service. Ignored."); return Intents.RESULT_SMS_HANDLED; } @@ -209,13 +209,13 @@ public final class GsmSMSDispatcher extends SMSDispatcher { mPhone.setVoiceMessageWaiting(1, -1); // line 1: unknown number of msgs waiting handled = sms.isMwiDontStore(); if (false) { - Log.d(TAG, "Received voice mail indicator set SMS shouldStore=" + !handled); + Rlog.d(TAG, "Received voice mail indicator set SMS shouldStore=" + !handled); } } else if (sms.isMWIClearMessage()) { mPhone.setVoiceMessageWaiting(1, 0); // line 1: no msgs waiting handled = sms.isMwiDontStore(); if (false) { - Log.d(TAG, "Received voice mail indicator clear SMS shouldStore=" + !handled); + Rlog.d(TAG, "Received voice mail indicator clear SMS shouldStore=" + !handled); } } @@ -243,7 +243,7 @@ public final class GsmSMSDispatcher extends SMSDispatcher { sendRawPdu(pdu.encodedScAddress, pdu.encodedMessage, sentIntent, deliveryIntent, destAddr); } else { - Log.e(TAG, "GsmSMSDispatcher.sendData(): getSubmitPdu() returned null"); + Rlog.e(TAG, "GsmSMSDispatcher.sendData(): getSubmitPdu() returned null"); } } @@ -257,7 +257,7 @@ public final class GsmSMSDispatcher extends SMSDispatcher { sendRawPdu(pdu.encodedScAddress, pdu.encodedMessage, sentIntent, deliveryIntent, destAddr); } else { - Log.e(TAG, "GsmSMSDispatcher.sendText(): getSubmitPdu() returned null"); + Rlog.e(TAG, "GsmSMSDispatcher.sendText(): getSubmitPdu() returned null"); } } @@ -280,7 +280,7 @@ public final class GsmSMSDispatcher extends SMSDispatcher { sendRawPdu(pdu.encodedScAddress, pdu.encodedMessage, sentIntent, deliveryIntent, destinationAddress); } else { - Log.e(TAG, "GsmSMSDispatcher.sendNewSubmitPdu(): getSubmitPdu() returned null"); + Rlog.e(TAG, "GsmSMSDispatcher.sendNewSubmitPdu(): getSubmitPdu() returned null"); } } @@ -387,7 +387,7 @@ public final class GsmSMSDispatcher extends SMSDispatcher { } sb.append(Integer.toHexString(b)).append(' '); } - Log.d(TAG, sb.toString()); + Rlog.d(TAG, sb.toString()); } } @@ -473,7 +473,7 @@ public final class GsmSMSDispatcher extends SMSDispatcher { } } } catch (RuntimeException e) { - Log.e(TAG, "Error in decoding SMS CB pdu", e); + Rlog.e(TAG, "Error in decoding SMS CB pdu", e); } } } diff --git a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index 8ccdc98b7..3a852b57a 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -65,7 +65,7 @@ import android.telephony.SignalStrength; import android.telephony.gsm.GsmCellLocation; import android.text.TextUtils; import android.util.EventLog; -import android.util.Log; +import android.telephony.Rlog; import android.util.TimeUtils; import java.io.FileDescriptor; @@ -181,7 +181,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { private ContentObserver mAutoTimeObserver = new ContentObserver(new Handler()) { @Override public void onChange(boolean selfChange) { - Log.i("GsmServiceStateTracker", "Auto time state changed"); + Rlog.i("GsmServiceStateTracker", "Auto time state changed"); revertToNitzTime(); } }; @@ -189,7 +189,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { private ContentObserver mAutoTimeZoneObserver = new ContentObserver(new Handler()) { @Override public void onChange(boolean selfChange) { - Log.i("GsmServiceStateTracker", "Auto time zone state changed"); + Rlog.i("GsmServiceStateTracker", "Auto time zone state changed"); revertToNitzTimeZone(); } }; @@ -270,7 +270,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { Message message; if (!phone.mIsTheCurrentActivePhone) { - Log.e(LOG_TAG, "Received message " + msg + + Rlog.e(LOG_TAG, "Received message " + msg + "[" + msg.what + "] while being destroyed. Ignoring."); return; } @@ -337,7 +337,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { cid = Integer.parseInt(states[2], 16); } } catch (NumberFormatException ex) { - Log.w(LOG_TAG, "error parsing location: " + ex); + Rlog.w(LOG_TAG, "error parsing location: " + ex); } } cellLoc.setLacAndCid(lac, cid); @@ -1508,7 +1508,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { } setAndBroadcastNetworkSetTime(c.getTimeInMillis()); - Log.i(LOG_TAG, "NITZ: after Setting time of day"); + Rlog.i(LOG_TAG, "NITZ: after Setting time of day"); } SystemProperties.set("gsm.nitz.time", String.valueOf(c.getTimeInMillis())); saveNitzTime(c.getTimeInMillis()); @@ -1707,16 +1707,16 @@ final class GsmServiceStateTracker extends ServiceStateTracker { } @Override protected void log(String s) { - Log.d(LOG_TAG, "[GsmSST] " + s); + Rlog.d(LOG_TAG, "[GsmSST] " + s); } @Override protected void loge(String s) { - Log.e(LOG_TAG, "[GsmSST] " + s); + Rlog.e(LOG_TAG, "[GsmSST] " + s); } private static void sloge(String s) { - Log.e(LOG_TAG, "[GsmSST] " + s); + Rlog.e(LOG_TAG, "[GsmSST] " + s); } @Override diff --git a/src/java/com/android/internal/telephony/gsm/SIMFileHandler.java b/src/java/com/android/internal/telephony/gsm/SIMFileHandler.java index 0387a707b..5296df256 100644 --- a/src/java/com/android/internal/telephony/gsm/SIMFileHandler.java +++ b/src/java/com/android/internal/telephony/gsm/SIMFileHandler.java @@ -17,7 +17,7 @@ package com.android.internal.telephony.gsm; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.IccConstants; @@ -71,18 +71,18 @@ public final class SIMFileHandler extends IccFileHandler implements IccConstants } String path = getCommonIccEFPath(efid); if (path == null) { - Log.e(LOG_TAG, "Error: EF Path being returned in null"); + Rlog.e(LOG_TAG, "Error: EF Path being returned in null"); } return path; } @Override protected void logd(String msg) { - Log.d(LOG_TAG, "[SIMFileHandler] " + msg); + Rlog.d(LOG_TAG, "[SIMFileHandler] " + msg); } @Override protected void loge(String msg) { - Log.e(LOG_TAG, "[SIMFileHandler] " + msg); + Rlog.e(LOG_TAG, "[SIMFileHandler] " + msg); } } diff --git a/src/java/com/android/internal/telephony/gsm/SIMRecords.java b/src/java/com/android/internal/telephony/gsm/SIMRecords.java index 73cb132a3..3374f8dfd 100755 --- a/src/java/com/android/internal/telephony/gsm/SIMRecords.java +++ b/src/java/com/android/internal/telephony/gsm/SIMRecords.java @@ -25,7 +25,7 @@ import android.os.Handler; import android.os.Message; import android.os.SystemProperties; import android.text.TextUtils; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.AdnRecord; import com.android.internal.telephony.AdnRecordCache; @@ -961,7 +961,7 @@ public class SIMRecords extends IccRecords { break; case EVENT_MARK_SMS_READ_DONE: - Log.i("ENF", "marked read: sms " + msg.arg1); + Rlog.i("ENF", "marked read: sms " + msg.arg1); break; @@ -1222,7 +1222,7 @@ public class SIMRecords extends IccRecords { private void handleSms(byte[] ba) { if (ba[0] != 0) - Log.d("ENF", "status : " + ba[0]); + Rlog.d("ENF", "status : " + ba[0]); // 3GPP TS 51.011 v5.0.0 (20011-12) 10.5.3 // 3 == "received by MS from network; message to be read" @@ -1247,7 +1247,7 @@ public class SIMRecords extends IccRecords { byte[] ba = (byte[]) messages.get(i); if (ba[0] != 0) - Log.i("ENF", "status " + i + ": " + ba[0]); + Rlog.i("ENF", "status " + i + ": " + ba[0]); // 3GPP TS 51.011 v5.0.0 (20011-12) 10.5.3 // 3 == "received by MS from network; message to be read" @@ -1635,19 +1635,19 @@ public class SIMRecords extends IccRecords { } protected void log(String s) { - Log.d(LOG_TAG, "[SIMRecords] " + s); + Rlog.d(LOG_TAG, "[SIMRecords] " + s); } protected void loge(String s) { - Log.e(LOG_TAG, "[SIMRecords] " + s); + Rlog.e(LOG_TAG, "[SIMRecords] " + s); } protected void logw(String s, Throwable tr) { - Log.w(LOG_TAG, "[SIMRecords] " + s, tr); + Rlog.w(LOG_TAG, "[SIMRecords] " + s, tr); } protected void logv(String s) { - Log.v(LOG_TAG, "[SIMRecords] " + s); + Rlog.v(LOG_TAG, "[SIMRecords] " + s); } /** diff --git a/src/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java b/src/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java index 37f9a4f6d..509a0df22 100644 --- a/src/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java +++ b/src/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java @@ -19,7 +19,7 @@ package com.android.internal.telephony.gsm; import java.util.concurrent.atomic.AtomicBoolean; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.IccFileHandler; import com.android.internal.telephony.IccPhoneBookInterfaceManager; @@ -46,9 +46,9 @@ public class SimPhoneBookInterfaceManager extends IccPhoneBookInterfaceManager { try { super.finalize(); } catch (Throwable throwable) { - Log.e(LOG_TAG, "Error while finalizing:", throwable); + Rlog.e(LOG_TAG, "Error while finalizing:", throwable); } - if(DBG) Log.d(LOG_TAG, "SimPhoneBookInterfaceManager finalized"); + if(DBG) Rlog.d(LOG_TAG, "SimPhoneBookInterfaceManager finalized"); } public int[] getAdnRecordsSize(int efid) { @@ -72,11 +72,11 @@ public class SimPhoneBookInterfaceManager extends IccPhoneBookInterfaceManager { } protected void logd(String msg) { - Log.d(LOG_TAG, "[SimPbInterfaceManager] " + msg); + Rlog.d(LOG_TAG, "[SimPbInterfaceManager] " + msg); } protected void loge(String msg) { - Log.e(LOG_TAG, "[SimPbInterfaceManager] " + msg); + Rlog.e(LOG_TAG, "[SimPbInterfaceManager] " + msg); } } diff --git a/src/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java b/src/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java index 92bf39036..d5f71403a 100644 --- a/src/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java +++ b/src/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java @@ -22,7 +22,7 @@ import android.os.AsyncResult; import android.os.Binder; import android.os.Handler; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.IccConstants; import com.android.internal.telephony.IccSmsInterfaceManager; @@ -115,9 +115,9 @@ public class SimSmsInterfaceManager extends IccSmsInterfaceManager { try { super.finalize(); } catch (Throwable throwable) { - Log.e(LOG_TAG, "Error while finalizing:", throwable); + Rlog.e(LOG_TAG, "Error while finalizing:", throwable); } - if(DBG) Log.d(LOG_TAG, "SimSmsInterfaceManager finalized"); + if(DBG) Rlog.d(LOG_TAG, "SimSmsInterfaceManager finalized"); } /** @@ -360,6 +360,6 @@ public class SimSmsInterfaceManager extends IccSmsInterfaceManager { @Override protected void log(String msg) { - Log.d(LOG_TAG, "[SimSmsInterfaceManager] " + msg); + Rlog.d(LOG_TAG, "[SimSmsInterfaceManager] " + msg); } } diff --git a/src/java/com/android/internal/telephony/gsm/SmsMessage.java b/src/java/com/android/internal/telephony/gsm/SmsMessage.java index 9421dd757..fd4d8c1d0 100644 --- a/src/java/com/android/internal/telephony/gsm/SmsMessage.java +++ b/src/java/com/android/internal/telephony/gsm/SmsMessage.java @@ -18,7 +18,7 @@ package com.android.internal.telephony.gsm; import android.telephony.PhoneNumberUtils; import android.text.format.Time; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.EncodeException; import com.android.internal.telephony.GsmAlphabet; @@ -105,7 +105,7 @@ public class SmsMessage extends SmsMessageBase { msg.parsePdu(pdu); return msg; } catch (RuntimeException ex) { - Log.e(LOG_TAG, "SMS PDU parsing failed: ", ex); + Rlog.e(LOG_TAG, "SMS PDU parsing failed: ", ex); return null; } } @@ -133,7 +133,7 @@ public class SmsMessage extends SmsMessageBase { msg.parsePdu(IccUtils.hexStringToBytes(lines[1])); return msg; } catch (RuntimeException ex) { - Log.e(LOG_TAG, "SMS PDU parsing failed: ", ex); + Rlog.e(LOG_TAG, "SMS PDU parsing failed: ", ex); return null; } } @@ -145,7 +145,7 @@ public class SmsMessage extends SmsMessageBase { msg.parsePdu(IccUtils.hexStringToBytes(line)); return msg; } catch (RuntimeException ex) { - Log.e(LOG_TAG, "CDS SMS PDU parsing failed: ", ex); + Rlog.e(LOG_TAG, "CDS SMS PDU parsing failed: ", ex); return null; } } @@ -170,7 +170,7 @@ public class SmsMessage extends SmsMessageBase { // or STORED_UNSENT // See TS 51.011 10.5.3 if ((data[0] & 1) == 0) { - Log.w(LOG_TAG, + Rlog.w(LOG_TAG, "SMS parsing failed: Trying to parse a free record"); return null; } else { @@ -186,7 +186,7 @@ public class SmsMessage extends SmsMessageBase { msg.parsePdu(pdu); return msg; } catch (RuntimeException ex) { - Log.e(LOG_TAG, "SMS PDU parsing failed: ", ex); + Rlog.e(LOG_TAG, "SMS PDU parsing failed: ", ex); return null; } } @@ -256,7 +256,7 @@ public class SmsMessage extends SmsMessageBase { SmsHeader smsHeader = SmsHeader.fromByteArray(header); if (smsHeader.languageTable != languageTable || smsHeader.languageShiftTable != languageShiftTable) { - Log.w(LOG_TAG, "Updating language table in SMS header: " + Rlog.w(LOG_TAG, "Updating language table in SMS header: " + smsHeader.languageTable + " -> " + languageTable + ", " + smsHeader.languageShiftTable + " -> " + languageShiftTable); smsHeader.languageTable = languageTable; @@ -289,7 +289,7 @@ public class SmsMessage extends SmsMessageBase { try { userData = encodeUCS2(message, header); } catch(UnsupportedEncodingException uex) { - Log.e(LOG_TAG, + Rlog.e(LOG_TAG, "Implausible UnsupportedEncodingException ", uex); return null; @@ -302,7 +302,7 @@ public class SmsMessage extends SmsMessageBase { userData = encodeUCS2(message, header); encoding = ENCODING_16BIT; } catch(UnsupportedEncodingException uex) { - Log.e(LOG_TAG, + Rlog.e(LOG_TAG, "Implausible UnsupportedEncodingException ", uex); return null; @@ -312,7 +312,7 @@ public class SmsMessage extends SmsMessageBase { if (encoding == ENCODING_7BIT) { if ((0xff & userData[0]) > MAX_USER_DATA_SEPTETS) { // Message too long - Log.e(LOG_TAG, "Message too long (" + (0xff & userData[0]) + " septets)"); + Rlog.e(LOG_TAG, "Message too long (" + (0xff & userData[0]) + " septets)"); return null; } // TP-Data-Coding-Scheme @@ -327,7 +327,7 @@ public class SmsMessage extends SmsMessageBase { } else { // assume UCS-2 if ((0xff & userData[0]) > MAX_USER_DATA_BYTES) { // Message too long - Log.e(LOG_TAG, "Message too long (" + (0xff & userData[0]) + " bytes)"); + Rlog.e(LOG_TAG, "Message too long (" + (0xff & userData[0]) + " bytes)"); return null; } // TP-Data-Coding-Scheme @@ -411,7 +411,7 @@ public class SmsMessage extends SmsMessageBase { byte[] smsHeaderData = SmsHeader.toByteArray(smsHeader); if ((data.length + smsHeaderData.length + 1) > MAX_USER_DATA_BYTES) { - Log.e(LOG_TAG, "SMS data message may only contain " + Rlog.e(LOG_TAG, "SMS data message may only contain " + (MAX_USER_DATA_BYTES - smsHeaderData.length - 1) + " bytes"); return null; } @@ -472,7 +472,7 @@ public class SmsMessage extends SmsMessageBase { if (statusReportRequested) { // Set TP-Status-Report-Request bit. mtiByte |= 0x20; - if (false) Log.d(LOG_TAG, "SMS status report requested"); + if (false) Rlog.d(LOG_TAG, "SMS status report requested"); } bo.write(mtiByte); @@ -530,7 +530,7 @@ public class SmsMessage extends SmsMessageBase { ret = PhoneNumberUtils .calledPartyBCDToString(pdu, cur, len); } catch (RuntimeException tr) { - Log.d(LOG_TAG, "invalid SC address: ", tr); + Rlog.d(LOG_TAG, "invalid SC address: ", tr); ret = null; } } @@ -564,7 +564,7 @@ public class SmsMessage extends SmsMessageBase { try { ret = new GsmSmsAddress(pdu, cur, lengthBytes); } catch (ParseException e) { - Log.e(LOG_TAG, e.getMessage()); + Rlog.e(LOG_TAG, e.getMessage()); ret = null; } @@ -738,7 +738,7 @@ public class SmsMessage extends SmsMessageBase { ret = new String(pdu, cur, byteCount, "utf-16"); } catch (UnsupportedEncodingException ex) { ret = ""; - Log.e(LOG_TAG, "implausible UnsupportedEncodingException", ex); + Rlog.e(LOG_TAG, "implausible UnsupportedEncodingException", ex); } cur += byteCount; @@ -759,7 +759,7 @@ public class SmsMessage extends SmsMessageBase { ret = new String(pdu, cur, byteCount, "KSC5601"); } catch (UnsupportedEncodingException ex) { ret = ""; - Log.e(LOG_TAG, "implausible UnsupportedEncodingException", ex); + Rlog.e(LOG_TAG, "implausible UnsupportedEncodingException", ex); } cur += byteCount; @@ -898,15 +898,15 @@ public class SmsMessage extends SmsMessageBase { */ private void parsePdu(byte[] pdu) { mPdu = pdu; - // Log.d(LOG_TAG, "raw sms message:"); - // Log.d(LOG_TAG, s); + // Rlog.d(LOG_TAG, "raw sms message:"); + // Rlog.d(LOG_TAG, s); PduParser p = new PduParser(pdu); scAddress = p.getSCAddress(); if (scAddress != null) { - if (false) Log.d(LOG_TAG, "SMS SC address: " + scAddress); + if (false) Rlog.d(LOG_TAG, "SMS SC address: " + scAddress); } // TODO(mkf) support reply path, user data header indicator @@ -992,7 +992,7 @@ public class SmsMessage extends SmsMessageBase { originatingAddress = p.getAddress(); if (originatingAddress != null) { - if (false) Log.v(LOG_TAG, "SMS originating address: " + if (false) Rlog.v(LOG_TAG, "SMS originating address: " + originatingAddress.address); } @@ -1005,13 +1005,13 @@ public class SmsMessage extends SmsMessageBase { dataCodingScheme = p.getByte(); if (false) { - Log.v(LOG_TAG, "SMS TP-PID:" + protocolIdentifier + Rlog.v(LOG_TAG, "SMS TP-PID:" + protocolIdentifier + " data coding scheme: " + dataCodingScheme); } scTimeMillis = p.getSCTimestampMillis(); - if (false) Log.d(LOG_TAG, "SMS SC timestamp: " + scTimeMillis); + if (false) Rlog.d(LOG_TAG, "SMS SC timestamp: " + scTimeMillis); boolean hasUserDataHeader = (firstByte & 0x40) == 0x40; @@ -1039,7 +1039,7 @@ public class SmsMessage extends SmsMessageBase { hasMessageClass = (0 != (dataCodingScheme & 0x10)); if (userDataCompressed) { - Log.w(LOG_TAG, "4 - Unsupported SMS data coding scheme " + Rlog.w(LOG_TAG, "4 - Unsupported SMS data coding scheme " + "(compression) " + (dataCodingScheme & 0xff)); } else { switch ((dataCodingScheme >> 2) & 0x3) { @@ -1053,7 +1053,7 @@ public class SmsMessage extends SmsMessageBase { case 1: // 8 bit data case 3: // reserved - Log.w(LOG_TAG, "1 - Unsupported SMS data coding scheme " + Rlog.w(LOG_TAG, "1 - Unsupported SMS data coding scheme " + (dataCodingScheme & 0xff)); encodingType = ENCODING_8BIT; break; @@ -1098,7 +1098,7 @@ public class SmsMessage extends SmsMessageBase { } else { isMwi = false; - Log.w(LOG_TAG, "MWI for fax, email, or other " + Rlog.w(LOG_TAG, "MWI for fax, email, or other " + (dataCodingScheme & 0xff)); } } else if ((dataCodingScheme & 0xC0) == 0x80) { @@ -1108,11 +1108,11 @@ public class SmsMessage extends SmsMessageBase { // This value used for KSC5601 by carriers in Korea. encodingType = ENCODING_KSC5601; } else { - Log.w(LOG_TAG, "5 - Unsupported SMS data coding scheme " + Rlog.w(LOG_TAG, "5 - Unsupported SMS data coding scheme " + (dataCodingScheme & 0xff)); } } else { - Log.w(LOG_TAG, "3 - Unsupported SMS data coding scheme " + Rlog.w(LOG_TAG, "3 - Unsupported SMS data coding scheme " + (dataCodingScheme & 0xff)); } @@ -1143,7 +1143,7 @@ public class SmsMessage extends SmsMessageBase { break; } - if (false) Log.v(LOG_TAG, "SMS message body (raw): '" + messageBody + "'"); + if (false) Rlog.v(LOG_TAG, "SMS message body (raw): '" + messageBody + "'"); if (messageBody != null) { parseMessageBody(); diff --git a/src/java/com/android/internal/telephony/gsm/SpnOverride.java b/src/java/com/android/internal/telephony/gsm/SpnOverride.java index 918c2d2be..575754ef4 100644 --- a/src/java/com/android/internal/telephony/gsm/SpnOverride.java +++ b/src/java/com/android/internal/telephony/gsm/SpnOverride.java @@ -26,7 +26,7 @@ import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import android.os.Environment; -import android.util.Log; +import android.telephony.Rlog; import android.util.Xml; import com.android.internal.util.XmlUtils; @@ -60,7 +60,7 @@ public class SpnOverride { try { spnReader = new FileReader(spnFile); } catch (FileNotFoundException e) { - Log.w(LOG_TAG, "Can't open " + + Rlog.w(LOG_TAG, "Can't open " + Environment.getRootDirectory() + "/" + PARTNER_SPN_OVERRIDE_PATH); return; } @@ -85,9 +85,9 @@ public class SpnOverride { CarrierSpnMap.put(numeric, data); } } catch (XmlPullParserException e) { - Log.w(LOG_TAG, "Exception in spn-conf parser " + e); + Rlog.w(LOG_TAG, "Exception in spn-conf parser " + e); } catch (IOException e) { - Log.w(LOG_TAG, "Exception in spn-conf parser " + e); + Rlog.w(LOG_TAG, "Exception in spn-conf parser " + e); } } diff --git a/src/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java b/src/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java index f47ff1b03..4d7fc9b11 100644 --- a/src/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java +++ b/src/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java @@ -21,7 +21,7 @@ import android.os.AsyncResult; import android.os.Handler; import android.os.Message; import android.provider.Telephony.Sms.Intents; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.IccIoResult; @@ -67,7 +67,7 @@ public class UsimDataDownloadHandler extends Handler { if (sendMessage(obtainMessage(EVENT_START_DATA_DOWNLOAD, smsMessage))) { return Activity.RESULT_OK; // we will send SMS ACK/ERROR based on UICC response } else { - Log.e(TAG, "startDataDownload failed to send message to start data download."); + Rlog.e(TAG, "startDataDownload failed to send message to start data download."); return Intents.RESULT_SMS_GENERIC_ERROR; } } @@ -122,7 +122,7 @@ public class UsimDataDownloadHandler extends Handler { // Verify that we calculated the payload size correctly. if (index != envelope.length) { - Log.e(TAG, "startDataDownload() calculated incorrect envelope length, aborting."); + Rlog.e(TAG, "startDataDownload() calculated incorrect envelope length, aborting."); acknowledgeSmsWithError(CommandsInterface.GSM_SMS_FAIL_CAUSE_UNSPECIFIED_ERROR); return; } @@ -164,17 +164,17 @@ public class UsimDataDownloadHandler extends Handler { boolean success; if ((sw1 == 0x90 && sw2 == 0x00) || sw1 == 0x91) { - Log.d(TAG, "USIM data download succeeded: " + response.toString()); + Rlog.d(TAG, "USIM data download succeeded: " + response.toString()); success = true; } else if (sw1 == 0x93 && sw2 == 0x00) { - Log.e(TAG, "USIM data download failed: Toolkit busy"); + Rlog.e(TAG, "USIM data download failed: Toolkit busy"); acknowledgeSmsWithError(CommandsInterface.GSM_SMS_FAIL_CAUSE_USIM_APP_TOOLKIT_BUSY); return; } else if (sw1 == 0x62 || sw1 == 0x63) { - Log.e(TAG, "USIM data download failed: " + response.toString()); + Rlog.e(TAG, "USIM data download failed: " + response.toString()); success = false; } else { - Log.e(TAG, "Unexpected SW1/SW2 response from UICC: " + response.toString()); + Rlog.e(TAG, "Unexpected SW1/SW2 response from UICC: " + response.toString()); success = false; } @@ -250,7 +250,7 @@ public class UsimDataDownloadHandler extends Handler { AsyncResult ar = (AsyncResult) msg.obj; if (ar.exception != null) { - Log.e(TAG, "UICC Send Envelope failure, exception: " + ar.exception); + Rlog.e(TAG, "UICC Send Envelope failure, exception: " + ar.exception); acknowledgeSmsWithError( CommandsInterface.GSM_SMS_FAIL_CAUSE_USIM_DATA_DOWNLOAD_ERROR); return; @@ -261,7 +261,7 @@ public class UsimDataDownloadHandler extends Handler { break; default: - Log.e(TAG, "Ignoring unexpected message, what=" + msg.what); + Rlog.e(TAG, "Ignoring unexpected message, what=" + msg.what); } } } diff --git a/src/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java b/src/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java index 8f5a4203f..c59aa34c2 100755 --- a/src/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java +++ b/src/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java @@ -19,7 +19,7 @@ package com.android.internal.telephony.gsm; import android.os.AsyncResult; import android.os.Handler; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.AdnRecord; import com.android.internal.telephony.AdnRecordCache; @@ -143,7 +143,7 @@ public class UsimPhoneBookManager extends Handler implements IccConstants { try { mLock.wait(); } catch (InterruptedException e) { - Log.e(LOG_TAG, "Interrupted Exception in readAdnFileAndWait"); + Rlog.e(LOG_TAG, "Interrupted Exception in readAdnFileAndWait"); } } @@ -161,7 +161,7 @@ public class UsimPhoneBookManager extends Handler implements IccConstants { if (mEmailPresentInIap) { readIapFileAndWait(fileIds.get(USIM_EFIAP_TAG)); if (mIapFileRecord == null) { - Log.e(LOG_TAG, "Error: IAP file is empty"); + Rlog.e(LOG_TAG, "Error: IAP file is empty"); return; } } @@ -171,11 +171,11 @@ public class UsimPhoneBookManager extends Handler implements IccConstants { try { mLock.wait(); } catch (InterruptedException e) { - Log.e(LOG_TAG, "Interrupted Exception in readEmailFileAndWait"); + Rlog.e(LOG_TAG, "Interrupted Exception in readEmailFileAndWait"); } if (mEmailFileRecord == null) { - Log.e(LOG_TAG, "Error: Email file is empty"); + Rlog.e(LOG_TAG, "Error: Email file is empty"); return; } updatePhoneAdnRecord(); @@ -188,7 +188,7 @@ public class UsimPhoneBookManager extends Handler implements IccConstants { try { mLock.wait(); } catch (InterruptedException e) { - Log.e(LOG_TAG, "Interrupted Exception in readIapFileAndWait"); + Rlog.e(LOG_TAG, "Interrupted Exception in readIapFileAndWait"); } } @@ -206,7 +206,7 @@ public class UsimPhoneBookManager extends Handler implements IccConstants { try { record = mIapFileRecord.get(i); } catch (IndexOutOfBoundsException e) { - Log.e(LOG_TAG, "Error: Improper ICC card: No IAP record for ADN, continuing"); + Rlog.e(LOG_TAG, "Error: Improper ICC card: No IAP record for ADN, continuing"); break; } int recNum = record[mEmailTagNumberInIap]; @@ -262,7 +262,7 @@ public class UsimPhoneBookManager extends Handler implements IccConstants { try { emailRec = mEmailFileRecord.get(i); } catch (IndexOutOfBoundsException e) { - Log.e(LOG_TAG, "Error: Improper ICC card: No email record for ADN, continuing"); + Rlog.e(LOG_TAG, "Error: Improper ICC card: No email record for ADN, continuing"); break; } int adnRecNum = emailRec[emailRec.length - 1]; @@ -318,7 +318,7 @@ public class UsimPhoneBookManager extends Handler implements IccConstants { try { mLock.wait(); } catch (InterruptedException e) { - Log.e(LOG_TAG, "Interrupted Exception in readAdnFileAndWait"); + Rlog.e(LOG_TAG, "Interrupted Exception in readAdnFileAndWait"); } } @@ -448,6 +448,6 @@ public class UsimPhoneBookManager extends Handler implements IccConstants { } private void log(String msg) { - if(DBG) Log.d(LOG_TAG, msg); + if(DBG) Rlog.d(LOG_TAG, msg); } } diff --git a/src/java/com/android/internal/telephony/gsm/VoiceMailConstants.java b/src/java/com/android/internal/telephony/gsm/VoiceMailConstants.java index d2665cb58..4b29480e8 100644 --- a/src/java/com/android/internal/telephony/gsm/VoiceMailConstants.java +++ b/src/java/com/android/internal/telephony/gsm/VoiceMailConstants.java @@ -18,7 +18,7 @@ package com.android.internal.telephony.gsm; import android.os.Environment; import android.util.Xml; -import android.util.Log; +import android.telephony.Rlog; import java.util.HashMap; import java.io.FileReader; @@ -79,7 +79,7 @@ class VoiceMailConstants { try { vmReader = new FileReader(vmFile); } catch (FileNotFoundException e) { - Log.w(LOG_TAG, "Can't open " + + Rlog.w(LOG_TAG, "Can't open " + Environment.getRootDirectory() + "/" + PARTNER_VOICEMAIL_PATH); return; } @@ -107,9 +107,9 @@ class VoiceMailConstants { CarrierVmMap.put(numeric, data); } } catch (XmlPullParserException e) { - Log.w(LOG_TAG, "Exception in Voicemail parser " + e); + Rlog.w(LOG_TAG, "Exception in Voicemail parser " + e); } catch (IOException e) { - Log.w(LOG_TAG, "Exception in Voicemail parser " + e); + Rlog.w(LOG_TAG, "Exception in Voicemail parser " + e); } finally { try { if (vmReader != null) { diff --git a/src/java/com/android/internal/telephony/ims/IsimFileHandler.java b/src/java/com/android/internal/telephony/ims/IsimFileHandler.java index 2e00c1959..41ba844b6 100644 --- a/src/java/com/android/internal/telephony/ims/IsimFileHandler.java +++ b/src/java/com/android/internal/telephony/ims/IsimFileHandler.java @@ -16,7 +16,7 @@ package com.android.internal.telephony.ims; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.IccConstants; @@ -48,11 +48,11 @@ public final class IsimFileHandler extends IccFileHandler implements IccConstant @Override protected void logd(String msg) { - Log.d(LOG_TAG, msg); + Rlog.d(LOG_TAG, msg); } @Override protected void loge(String msg) { - Log.e(LOG_TAG, msg); + Rlog.e(LOG_TAG, msg); } } diff --git a/src/java/com/android/internal/telephony/ims/IsimUiccRecords.java b/src/java/com/android/internal/telephony/ims/IsimUiccRecords.java index e81ae7fff..c8e06361b 100644 --- a/src/java/com/android/internal/telephony/ims/IsimUiccRecords.java +++ b/src/java/com/android/internal/telephony/ims/IsimUiccRecords.java @@ -20,7 +20,7 @@ import android.content.Context; import android.os.AsyncResult; import android.os.Handler; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.AdnRecord; import com.android.internal.telephony.AdnRecordCache; @@ -89,7 +89,7 @@ public final class IsimUiccRecords extends IccRecords implements IsimRecords { // ***** Overridden from Handler public void handleMessage(Message msg) { if (mDestroyed.get()) { - Log.e(LOG_TAG, "Received message " + msg + + Rlog.e(LOG_TAG, "Received message " + msg + "[" + msg.what + "] while being destroyed. Ignoring."); return; } @@ -106,7 +106,7 @@ public final class IsimUiccRecords extends IccRecords implements IsimRecords { } } catch (RuntimeException exc) { // I don't want these exceptions to be fatal - Log.w(LOG_TAG, "Exception parsing SIM record", exc); + Rlog.w(LOG_TAG, "Exception parsing SIM record", exc); } } @@ -188,7 +188,7 @@ public final class IsimUiccRecords extends IccRecords implements IsimRecords { } } while (tlv.nextObject()); - Log.e(LOG_TAG, "[ISIM] can't find TLV tag in ISIM record, returning null"); + Rlog.e(LOG_TAG, "[ISIM] can't find TLV tag in ISIM record, returning null"); return null; } @@ -271,11 +271,11 @@ public final class IsimUiccRecords extends IccRecords implements IsimRecords { @Override protected void log(String s) { - if (DBG) Log.d(LOG_TAG, "[ISIM] " + s); + if (DBG) Rlog.d(LOG_TAG, "[ISIM] " + s); } @Override protected void loge(String s) { - if (DBG) Log.e(LOG_TAG, "[ISIM] " + s); + if (DBG) Rlog.e(LOG_TAG, "[ISIM] " + s); } } diff --git a/src/java/com/android/internal/telephony/sip/SipConnectionBase.java b/src/java/com/android/internal/telephony/sip/SipConnectionBase.java index eaba2c47c..eca4a50a7 100644 --- a/src/java/com/android/internal/telephony/sip/SipConnectionBase.java +++ b/src/java/com/android/internal/telephony/sip/SipConnectionBase.java @@ -24,7 +24,7 @@ import com.android.internal.telephony.UUSInfo; import android.net.sip.SipAudioCall; import android.os.SystemClock; -import android.util.Log; +import android.telephony.Rlog; import android.telephony.PhoneNumberUtils; abstract class SipConnectionBase extends Connection { @@ -165,7 +165,7 @@ abstract class SipConnectionBase extends Connection { } private void log(String msg) { - Log.d(LOG_TAG, "[SipConn] " + msg); + Rlog.d(LOG_TAG, "[SipConn] " + msg); } @Override diff --git a/src/java/com/android/internal/telephony/sip/SipPhone.java b/src/java/com/android/internal/telephony/sip/SipPhone.java index 346b12662..24651dfdc 100644 --- a/src/java/com/android/internal/telephony/sip/SipPhone.java +++ b/src/java/com/android/internal/telephony/sip/SipPhone.java @@ -30,7 +30,7 @@ import android.os.Message; import android.telephony.PhoneNumberUtils; import android.telephony.ServiceState; import android.text.TextUtils; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.Call; import com.android.internal.telephony.CallStateException; @@ -64,7 +64,7 @@ public class SipPhone extends SipPhoneBase { SipPhone (Context context, PhoneNotifier notifier, SipProfile profile) { super(context, notifier); - if (DEBUG) Log.d(LOG_TAG, "new SipPhone: " + profile.getUriString()); + if (DEBUG) Rlog.d(LOG_TAG, "new SipPhone: " + profile.getUriString()); ringingCall = new SipCall(); foregroundCall = new SipCall(); backgroundCall = new SipCall(); @@ -106,7 +106,7 @@ public class SipPhone extends SipPhoneBase { try { SipAudioCall sipAudioCall = (SipAudioCall) incomingCall; - if (DEBUG) Log.d(LOG_TAG, "+++ taking call from: " + if (DEBUG) Rlog.d(LOG_TAG, "+++ taking call from: " + sipAudioCall.getPeerProfile().getUriString()); String localUri = sipAudioCall.getLocalProfile().getUriString(); if (localUri.equals(mProfile.getUriString())) { @@ -115,7 +115,7 @@ public class SipPhone extends SipPhoneBase { if (sipAudioCall.getState() != SipSession.State.INCOMING_CALL) { // Peer cancelled the call! - if (DEBUG) Log.d(LOG_TAG, " call cancelled !!"); + if (DEBUG) Rlog.d(LOG_TAG, " call cancelled !!"); ringingCall.reset(); } return true; @@ -134,7 +134,7 @@ public class SipPhone extends SipPhoneBase { synchronized (SipPhone.class) { if ((ringingCall.getState() == Call.State.INCOMING) || (ringingCall.getState() == Call.State.WAITING)) { - if (DEBUG) Log.d(LOG_TAG, "acceptCall"); + if (DEBUG) Rlog.d(LOG_TAG, "acceptCall"); // Always unmute when answering a new call ringingCall.setMute(false); ringingCall.acceptCall(); @@ -147,7 +147,7 @@ public class SipPhone extends SipPhoneBase { public void rejectCall() throws CallStateException { synchronized (SipPhone.class) { if (ringingCall.getState().isRinging()) { - if (DEBUG) Log.d(LOG_TAG, "rejectCall"); + if (DEBUG) Rlog.d(LOG_TAG, "rejectCall"); ringingCall.rejectCall(); } else { throw new CallStateException("phone not ringing"); @@ -181,13 +181,13 @@ public class SipPhone extends SipPhoneBase { Connection c = foregroundCall.dial(dialString); return c; } catch (SipException e) { - Log.e(LOG_TAG, "dial()", e); + Rlog.e(LOG_TAG, "dial()", e); throw new CallStateException("dial error: " + e); } } public void switchHoldingAndActive() throws CallStateException { - if (DEBUG) Log.d(LOG_TAG, " ~~~~~~ switch fg and bg"); + if (DEBUG) Rlog.d(LOG_TAG, " ~~~~~~ switch fg and bg"); synchronized (SipPhone.class) { foregroundCall.switchWith(backgroundCall); if (backgroundCall.getState().isAlive()) backgroundCall.hold(); @@ -242,7 +242,7 @@ public class SipPhone extends SipPhoneBase { public void sendDtmf(char c) { if (!PhoneNumberUtils.is12Key(c)) { - Log.e(LOG_TAG, + Rlog.e(LOG_TAG, "sendDtmf called with invalid character '" + c + "'"); } else if (foregroundCall.getState().isAlive()) { synchronized (SipPhone.class) { @@ -253,7 +253,7 @@ public class SipPhone extends SipPhoneBase { public void startDtmf(char c) { if (!PhoneNumberUtils.is12Key(c)) { - Log.e(LOG_TAG, + Rlog.e(LOG_TAG, "startDtmf called with invalid character '" + c + "'"); } else { sendDtmf(c); @@ -265,7 +265,7 @@ public class SipPhone extends SipPhoneBase { } public void sendBurstDtmf(String dtmfString) { - Log.e(LOG_TAG, "[SipPhone] sendBurstDtmf() is a CDMA method"); + Rlog.e(LOG_TAG, "[SipPhone] sendBurstDtmf() is a CDMA method"); } public void getOutgoingCallerIdDisplay(Message onComplete) { @@ -289,7 +289,7 @@ public class SipPhone extends SipPhoneBase { public void setCallWaiting(boolean enable, Message onComplete) { // FIXME: what to reply? - Log.e(LOG_TAG, "call waiting not supported"); + Rlog.e(LOG_TAG, "call waiting not supported"); } @Override @@ -410,7 +410,7 @@ public class SipPhone extends SipPhoneBase { public void hangup() throws CallStateException { synchronized (SipPhone.class) { if (state.isAlive()) { - if (DEBUG) Log.d(LOG_TAG, "hang up call: " + getState() + if (DEBUG) Rlog.d(LOG_TAG, "hang up call: " + getState() + ": " + this + " on phone " + getPhone()); setState(State.DISCONNECTING); CallStateException excp = null; @@ -423,7 +423,7 @@ public class SipPhone extends SipPhoneBase { } if (excp != null) throw excp; } else { - if (DEBUG) Log.d(LOG_TAG, "hang up dead call: " + getState() + if (DEBUG) Rlog.d(LOG_TAG, "hang up dead call: " + getState() + ": " + this + " on phone " + getPhone()); } } @@ -473,7 +473,7 @@ public class SipPhone extends SipPhoneBase { } else { audioGroup.setMode(AudioGroup.MODE_NORMAL); } - if (DEBUG) Log.d(LOG_TAG, String.format( + if (DEBUG) Rlog.d(LOG_TAG, String.format( "audioGroup mode change: %d --> %d", mode, audioGroup.getMode())); } @@ -558,7 +558,7 @@ public class SipPhone extends SipPhoneBase { @Override protected void setState(State newState) { if (state != newState) { - if (DEBUG) Log.v(LOG_TAG, "+***+ call state changed: " + state + if (DEBUG) Rlog.v(LOG_TAG, "+***+ call state changed: " + state + " --> " + newState + ": " + this + ": on phone " + getPhone() + " " + connections.size()); @@ -585,10 +585,10 @@ public class SipPhone extends SipPhoneBase { // set state to DISCONNECTED only when all conns are disconnected if (state != State.DISCONNECTED) { boolean allConnectionsDisconnected = true; - if (DEBUG) Log.d(LOG_TAG, "---check connections: " + if (DEBUG) Rlog.d(LOG_TAG, "---check connections: " + connections.size()); for (Connection c : connections) { - if (DEBUG) Log.d(LOG_TAG, " state=" + c.getState() + ": " + if (DEBUG) Rlog.d(LOG_TAG, " state=" + c.getState() + ": " + c); if (c.getState() != State.DISCONNECTED) { allConnectionsDisconnected = false; @@ -627,7 +627,7 @@ public class SipPhone extends SipPhoneBase { String sessionState = (sipAudioCall == null) ? "" : (sipAudioCall.getState() + ", "); - if (DEBUG) Log.d(LOG_TAG, "--- connection ended: " + if (DEBUG) Rlog.d(LOG_TAG, "--- connection ended: " + mPeer.getUriString() + ": " + sessionState + "cause: " + getDisconnectCause() + ", on phone " + getPhone()); @@ -674,7 +674,7 @@ public class SipPhone extends SipPhoneBase { setState(newState); } mOwner.onConnectionStateChanged(SipConnection.this); - if (DEBUG) Log.v(LOG_TAG, "+***+ connection state changed: " + if (DEBUG) Rlog.v(LOG_TAG, "+***+ connection state changed: " + mPeer.getUriString() + ": " + mState + " on phone " + getPhone()); } @@ -682,7 +682,7 @@ public class SipPhone extends SipPhoneBase { @Override protected void onError(DisconnectCause cause) { - if (DEBUG) Log.d(LOG_TAG, "SIP error: " + cause); + if (DEBUG) Rlog.d(LOG_TAG, "SIP error: " + cause); onCallEnded(cause); } }; @@ -810,7 +810,7 @@ public class SipPhone extends SipPhoneBase { @Override public void hangup() throws CallStateException { synchronized (SipPhone.class) { - if (DEBUG) Log.d(LOG_TAG, "hangup conn: " + mPeer.getUriString() + if (DEBUG) Rlog.d(LOG_TAG, "hangup conn: " + mPeer.getUriString() + ": " + mState + ": on phone " + getPhone().getPhoneName()); if (!mState.isAlive()) return; @@ -842,7 +842,7 @@ public class SipPhone extends SipPhoneBase { "cannot put conn back to a call in non-idle state: " + call.getState()); } - if (DEBUG) Log.d(LOG_TAG, "separate conn: " + if (DEBUG) Rlog.d(LOG_TAG, "separate conn: " + mPeer.getUriString() + " from " + mOwner + " back to " + call); @@ -877,7 +877,7 @@ public class SipPhone extends SipPhoneBase { case SipSession.State.OUTGOING_CALL_CANCELING: return Call.State.DISCONNECTING; case SipSession.State.IN_CALL: return Call.State.ACTIVE; default: - Log.w(LOG_TAG, "illegal connection state: " + sessionState); + Rlog.w(LOG_TAG, "illegal connection state: " + sessionState); return Call.State.DISCONNECTED; } } @@ -930,7 +930,7 @@ public class SipPhone extends SipPhoneBase { case SipErrorCode.SOCKET_ERROR: case SipErrorCode.CLIENT_ERROR: default: - Log.w(LOG_TAG, "error: " + SipErrorCode.toString(errorCode) + Rlog.w(LOG_TAG, "error: " + SipErrorCode.toString(errorCode) + ": " + errorMessage); onError(Connection.DisconnectCause.ERROR_UNSPECIFIED); } diff --git a/src/java/com/android/internal/telephony/sip/SipPhoneBase.java b/src/java/com/android/internal/telephony/sip/SipPhoneBase.java index 43b0de38d..9c0c2666a 100755 --- a/src/java/com/android/internal/telephony/sip/SipPhoneBase.java +++ b/src/java/com/android/internal/telephony/sip/SipPhoneBase.java @@ -28,7 +28,7 @@ import android.telephony.CellInfo; import android.telephony.CellLocation; import android.telephony.ServiceState; import android.telephony.SignalStrength; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.Call; import com.android.internal.telephony.CallStateException; @@ -211,17 +211,17 @@ abstract class SipPhoneBase extends PhoneBase { public boolean canDial() { int serviceState = getServiceState().getState(); - Log.v(LOG_TAG, "canDial(): serviceState = " + serviceState); + Rlog.v(LOG_TAG, "canDial(): serviceState = " + serviceState); if (serviceState == ServiceState.STATE_POWER_OFF) return false; String disableCall = SystemProperties.get( TelephonyProperties.PROPERTY_DISABLE_CALL, "false"); - Log.v(LOG_TAG, "canDial(): disableCall = " + disableCall); + Rlog.v(LOG_TAG, "canDial(): disableCall = " + disableCall); if (disableCall.equals("true")) return false; - Log.v(LOG_TAG, "canDial(): ringingCall: " + getRingingCall().getState()); - Log.v(LOG_TAG, "canDial(): foregndCall: " + getForegroundCall().getState()); - Log.v(LOG_TAG, "canDial(): backgndCall: " + getBackgroundCall().getState()); + Rlog.v(LOG_TAG, "canDial(): ringingCall: " + getRingingCall().getState()); + Rlog.v(LOG_TAG, "canDial(): foregndCall: " + getForegroundCall().getState()); + Rlog.v(LOG_TAG, "canDial(): backgndCall: " + getBackgroundCall().getState()); return !getRingingCall().isRinging() && (!getForegroundCall().getState().isAlive() || !getBackgroundCall().getState().isAlive()); @@ -279,12 +279,12 @@ abstract class SipPhoneBase extends PhoneBase { } public String getEsn() { - Log.e(LOG_TAG, "[SipPhone] getEsn() is a CDMA method"); + Rlog.e(LOG_TAG, "[SipPhone] getEsn() is a CDMA method"); return "0"; } public String getMeid() { - Log.e(LOG_TAG, "[SipPhone] getMeid() is a CDMA method"); + Rlog.e(LOG_TAG, "[SipPhone] getMeid() is a CDMA method"); return "0"; } @@ -344,7 +344,7 @@ abstract class SipPhoneBase extends PhoneBase { } public void setCallWaiting(boolean enable, Message onComplete) { - Log.e(LOG_TAG, "call waiting not supported"); + Rlog.e(LOG_TAG, "call waiting not supported"); } public boolean getIccRecordsLoaded() { @@ -431,15 +431,15 @@ abstract class SipPhoneBase extends PhoneBase { } public void activateCellBroadcastSms(int activate, Message response) { - Log.e(LOG_TAG, "Error! This functionality is not implemented for SIP."); + Rlog.e(LOG_TAG, "Error! This functionality is not implemented for SIP."); } public void getCellBroadcastSmsConfig(Message response) { - Log.e(LOG_TAG, "Error! This functionality is not implemented for SIP."); + Rlog.e(LOG_TAG, "Error! This functionality is not implemented for SIP."); } public void setCellBroadcastSmsConfig(int[] configValuesArray, Message response){ - Log.e(LOG_TAG, "Error! This functionality is not implemented for SIP."); + Rlog.e(LOG_TAG, "Error! This functionality is not implemented for SIP."); } //@Override @@ -467,7 +467,7 @@ abstract class SipPhoneBase extends PhoneBase { } if (state != oldState) { - Log.d(LOG_TAG, " ^^^ new phone state: " + state); + Rlog.d(LOG_TAG, " ^^^ new phone state: " + state); notifyPhoneStateChanged(); } } diff --git a/src/java/com/android/internal/telephony/sip/SipPhoneFactory.java b/src/java/com/android/internal/telephony/sip/SipPhoneFactory.java index 611e3ea02..3383bedfb 100644 --- a/src/java/com/android/internal/telephony/sip/SipPhoneFactory.java +++ b/src/java/com/android/internal/telephony/sip/SipPhoneFactory.java @@ -20,7 +20,7 @@ import com.android.internal.telephony.PhoneNotifier; import android.content.Context; import android.net.sip.SipProfile; -import android.util.Log; +import android.telephony.Rlog; import java.text.ParseException; @@ -42,7 +42,7 @@ public class SipPhoneFactory { SipProfile profile = new SipProfile.Builder(sipUri).build(); return new SipPhone(context, phoneNotifier, profile); } catch (ParseException e) { - Log.w("SipPhoneFactory", "makePhone", e); + Rlog.w("SipPhoneFactory", "makePhone", e); return null; } } diff --git a/src/java/com/android/internal/telephony/test/ModelInterpreter.java b/src/java/com/android/internal/telephony/test/ModelInterpreter.java index b116c354c..20aca8974 100644 --- a/src/java/com/android/internal/telephony/test/ModelInterpreter.java +++ b/src/java/com/android/internal/telephony/test/ModelInterpreter.java @@ -19,7 +19,7 @@ package com.android.internal.telephony.test; import android.os.HandlerThread; import android.os.Looper; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import java.io.IOException; import java.io.InputStream; @@ -204,7 +204,7 @@ public class ModelInterpreter try { s = ss.accept(); } catch (java.io.IOException ex) { - Log.w(LOG_TAG, + Rlog.w(LOG_TAG, "IOException on socket.accept(); stopping", ex); return; } @@ -213,12 +213,12 @@ public class ModelInterpreter in = s.getInputStream(); out = s.getOutputStream(); } catch (java.io.IOException ex) { - Log.w(LOG_TAG, + Rlog.w(LOG_TAG, "IOException on accepted socket(); re-listening", ex); continue; } - Log.i(LOG_TAG, "New connection accepted"); + Rlog.i(LOG_TAG, "New connection accepted"); } @@ -260,7 +260,7 @@ public class ModelInterpreter } } - Log.i(LOG_TAG, "Disconnected"); + Rlog.i(LOG_TAG, "Disconnected"); if (ss == null) { // no reconnect in this case diff --git a/src/java/com/android/internal/telephony/test/SimulatedCommands.java b/src/java/com/android/internal/telephony/test/SimulatedCommands.java index 4f61509f9..167204479 100644 --- a/src/java/com/android/internal/telephony/test/SimulatedCommands.java +++ b/src/java/com/android/internal/telephony/test/SimulatedCommands.java @@ -20,7 +20,7 @@ import android.os.AsyncResult; import android.os.HandlerThread; import android.os.Looper; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.BaseCommands; import com.android.internal.telephony.CommandException; @@ -109,7 +109,7 @@ public final class SimulatedCommands extends BaseCommands public void supplyIccPin(String pin, Message result) { if (mSimLockedState != SimLockState.REQUIRE_PIN) { - Log.i(LOG_TAG, "[SimCmd] supplyIccPin: wrong state, state=" + + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPin: wrong state, state=" + mSimLockedState); CommandException ex = new CommandException( CommandException.Error.PASSWORD_INCORRECT); @@ -119,7 +119,7 @@ public final class SimulatedCommands extends BaseCommands } if (pin != null && pin.equals(mPinCode)) { - Log.i(LOG_TAG, "[SimCmd] supplyIccPin: success!"); + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPin: success!"); mPinUnlockAttempts = 0; mSimLockedState = SimLockState.NONE; mIccStatusChangedRegistrants.notifyRegistrants(); @@ -135,10 +135,10 @@ public final class SimulatedCommands extends BaseCommands if (result != null) { mPinUnlockAttempts ++; - Log.i(LOG_TAG, "[SimCmd] supplyIccPin: failed! attempt=" + + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPin: failed! attempt=" + mPinUnlockAttempts); if (mPinUnlockAttempts >= 3) { - Log.i(LOG_TAG, "[SimCmd] supplyIccPin: set state to REQUIRE_PUK"); + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPin: set state to REQUIRE_PUK"); mSimLockedState = SimLockState.REQUIRE_PUK; } @@ -151,7 +151,7 @@ public final class SimulatedCommands extends BaseCommands public void supplyIccPuk(String puk, String newPin, Message result) { if (mSimLockedState != SimLockState.REQUIRE_PUK) { - Log.i(LOG_TAG, "[SimCmd] supplyIccPuk: wrong state, state=" + + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPuk: wrong state, state=" + mSimLockedState); CommandException ex = new CommandException( CommandException.Error.PASSWORD_INCORRECT); @@ -161,7 +161,7 @@ public final class SimulatedCommands extends BaseCommands } if (puk != null && puk.equals(SIM_PUK_CODE)) { - Log.i(LOG_TAG, "[SimCmd] supplyIccPuk: success!"); + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPuk: success!"); mSimLockedState = SimLockState.NONE; mPukUnlockAttempts = 0; mIccStatusChangedRegistrants.notifyRegistrants(); @@ -177,10 +177,10 @@ public final class SimulatedCommands extends BaseCommands if (result != null) { mPukUnlockAttempts ++; - Log.i(LOG_TAG, "[SimCmd] supplyIccPuk: failed! attempt=" + + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPuk: failed! attempt=" + mPukUnlockAttempts); if (mPukUnlockAttempts >= 10) { - Log.i(LOG_TAG, "[SimCmd] supplyIccPuk: set state to SIM_PERM_LOCKED"); + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPuk: set state to SIM_PERM_LOCKED"); mSimLockedState = SimLockState.SIM_PERM_LOCKED; } @@ -193,7 +193,7 @@ public final class SimulatedCommands extends BaseCommands public void supplyIccPin2(String pin2, Message result) { if (mSimFdnEnabledState != SimFdnState.REQUIRE_PIN2) { - Log.i(LOG_TAG, "[SimCmd] supplyIccPin2: wrong state, state=" + + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPin2: wrong state, state=" + mSimFdnEnabledState); CommandException ex = new CommandException( CommandException.Error.PASSWORD_INCORRECT); @@ -203,7 +203,7 @@ public final class SimulatedCommands extends BaseCommands } if (pin2 != null && pin2.equals(mPin2Code)) { - Log.i(LOG_TAG, "[SimCmd] supplyIccPin2: success!"); + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPin2: success!"); mPin2UnlockAttempts = 0; mSimFdnEnabledState = SimFdnState.NONE; @@ -218,10 +218,10 @@ public final class SimulatedCommands extends BaseCommands if (result != null) { mPin2UnlockAttempts ++; - Log.i(LOG_TAG, "[SimCmd] supplyIccPin2: failed! attempt=" + + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPin2: failed! attempt=" + mPin2UnlockAttempts); if (mPin2UnlockAttempts >= 3) { - Log.i(LOG_TAG, "[SimCmd] supplyIccPin2: set state to REQUIRE_PUK2"); + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPin2: set state to REQUIRE_PUK2"); mSimFdnEnabledState = SimFdnState.REQUIRE_PUK2; } @@ -234,7 +234,7 @@ public final class SimulatedCommands extends BaseCommands public void supplyIccPuk2(String puk2, String newPin2, Message result) { if (mSimFdnEnabledState != SimFdnState.REQUIRE_PUK2) { - Log.i(LOG_TAG, "[SimCmd] supplyIccPuk2: wrong state, state=" + + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPuk2: wrong state, state=" + mSimLockedState); CommandException ex = new CommandException( CommandException.Error.PASSWORD_INCORRECT); @@ -244,7 +244,7 @@ public final class SimulatedCommands extends BaseCommands } if (puk2 != null && puk2.equals(SIM_PUK2_CODE)) { - Log.i(LOG_TAG, "[SimCmd] supplyIccPuk2: success!"); + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPuk2: success!"); mSimFdnEnabledState = SimFdnState.NONE; mPuk2UnlockAttempts = 0; @@ -259,10 +259,10 @@ public final class SimulatedCommands extends BaseCommands if (result != null) { mPuk2UnlockAttempts ++; - Log.i(LOG_TAG, "[SimCmd] supplyIccPuk2: failed! attempt=" + + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPuk2: failed! attempt=" + mPuk2UnlockAttempts); if (mPuk2UnlockAttempts >= 10) { - Log.i(LOG_TAG, "[SimCmd] supplyIccPuk2: set state to SIM_PERM_LOCKED"); + Rlog.i(LOG_TAG, "[SimCmd] supplyIccPuk2: set state to SIM_PERM_LOCKED"); mSimFdnEnabledState = SimFdnState.SIM_PERM_LOCKED; } @@ -285,7 +285,7 @@ public final class SimulatedCommands extends BaseCommands } if (result != null) { - Log.i(LOG_TAG, "[SimCmd] changeIccPin: pin failed!"); + Rlog.i(LOG_TAG, "[SimCmd] changeIccPin: pin failed!"); CommandException ex = new CommandException( CommandException.Error.PASSWORD_INCORRECT); @@ -306,7 +306,7 @@ public final class SimulatedCommands extends BaseCommands } if (result != null) { - Log.i(LOG_TAG, "[SimCmd] changeIccPin2: pin2 failed!"); + Rlog.i(LOG_TAG, "[SimCmd] changeIccPin2: pin2 failed!"); CommandException ex = new CommandException( CommandException.Error.PASSWORD_INCORRECT); @@ -325,7 +325,7 @@ public final class SimulatedCommands extends BaseCommands resultSuccess(result, null); if (enable && mSsnNotifyOn) { - Log.w(LOG_TAG, "Supp Service Notifications already enabled!"); + Rlog.w(LOG_TAG, "Supp Service Notifications already enabled!"); } mSsnNotifyOn = enable; @@ -344,7 +344,7 @@ public final class SimulatedCommands extends BaseCommands if (result != null) { int[] r = new int[1]; r[0] = (mSimLockEnabled ? 1 : 0); - Log.i(LOG_TAG, "[SimCmd] queryFacilityLock: SIM is " + Rlog.i(LOG_TAG, "[SimCmd] queryFacilityLock: SIM is " + (r[0] == 0 ? "unlocked" : "locked")); AsyncResult.forMessage(result, r, null); result.sendToTarget(); @@ -354,7 +354,7 @@ public final class SimulatedCommands extends BaseCommands if (result != null) { int[] r = new int[1]; r[0] = (mSimFdnEnabled ? 1 : 0); - Log.i(LOG_TAG, "[SimCmd] queryFacilityLock: FDN is " + Rlog.i(LOG_TAG, "[SimCmd] queryFacilityLock: FDN is " + (r[0] == 0 ? "disabled" : "enabled")); AsyncResult.forMessage(result, r, null); result.sendToTarget(); @@ -378,7 +378,7 @@ public final class SimulatedCommands extends BaseCommands if (facility != null && facility.equals(CommandsInterface.CB_FACILITY_BA_SIM)) { if (pin != null && pin.equals(mPinCode)) { - Log.i(LOG_TAG, "[SimCmd] setFacilityLock: pin is valid"); + Rlog.i(LOG_TAG, "[SimCmd] setFacilityLock: pin is valid"); mSimLockEnabled = lockEnabled; if (result != null) { @@ -390,7 +390,7 @@ public final class SimulatedCommands extends BaseCommands } if (result != null) { - Log.i(LOG_TAG, "[SimCmd] setFacilityLock: pin failed!"); + Rlog.i(LOG_TAG, "[SimCmd] setFacilityLock: pin failed!"); CommandException ex = new CommandException( CommandException.Error.GENERIC_FAILURE); @@ -402,7 +402,7 @@ public final class SimulatedCommands extends BaseCommands } else if (facility != null && facility.equals(CommandsInterface.CB_FACILITY_BA_FD)) { if (pin != null && pin.equals(mPin2Code)) { - Log.i(LOG_TAG, "[SimCmd] setFacilityLock: pin2 is valid"); + Rlog.i(LOG_TAG, "[SimCmd] setFacilityLock: pin2 is valid"); mSimFdnEnabled = lockEnabled; if (result != null) { @@ -414,7 +414,7 @@ public final class SimulatedCommands extends BaseCommands } if (result != null) { - Log.i(LOG_TAG, "[SimCmd] setFacilityLock: pin2 failed!"); + Rlog.i(LOG_TAG, "[SimCmd] setFacilityLock: pin2 failed!"); CommandException ex = new CommandException( CommandException.Error.GENERIC_FAILURE); @@ -442,10 +442,10 @@ public final class SimulatedCommands extends BaseCommands */ public void getCurrentCalls (Message result) { if ((mState == RadioState.RADIO_ON) && !isSimLocked()) { - //Log.i("GSM", "[SimCmds] getCurrentCalls"); + //Rlog.i("GSM", "[SimCmds] getCurrentCalls"); resultSuccess(result, simulatedCallState.getDriverCalls()); } else { - //Log.i("GSM", "[SimCmds] getCurrentCalls: RADIO_OFF or SIM not ready!"); + //Rlog.i("GSM", "[SimCmds] getCurrentCalls: RADIO_OFF or SIM not ready!"); resultFail(result, new CommandException( CommandException.Error.RADIO_NOT_AVAILABLE)); @@ -557,10 +557,10 @@ public final class SimulatedCommands extends BaseCommands success = simulatedCallState.onChld('1', (char)('0'+gsmIndex)); if (!success){ - Log.i("GSM", "[SimCmd] hangupConnection: resultFail"); + Rlog.i("GSM", "[SimCmd] hangupConnection: resultFail"); resultFail(result, new RuntimeException("Hangup Error")); } else { - Log.i("GSM", "[SimCmd] hangupConnection: resultSuccess"); + Rlog.i("GSM", "[SimCmd] hangupConnection: resultSuccess"); resultSuccess(result, null); } } @@ -942,22 +942,22 @@ public final class SimulatedCommands extends BaseCommands public void sendSMS (String smscPDU, String pdu, Message result) {unimplemented(result);} public void deleteSmsOnSim(int index, Message response) { - Log.d(LOG_TAG, "Delete message at index " + index); + Rlog.d(LOG_TAG, "Delete message at index " + index); unimplemented(response); } public void deleteSmsOnRuim(int index, Message response) { - Log.d(LOG_TAG, "Delete RUIM message at index " + index); + Rlog.d(LOG_TAG, "Delete RUIM message at index " + index); unimplemented(response); } public void writeSmsToSim(int status, String smsc, String pdu, Message response) { - Log.d(LOG_TAG, "Write SMS to SIM with status " + status); + Rlog.d(LOG_TAG, "Write SMS to SIM with status " + status); unimplemented(response); } public void writeSmsToRuim(int status, String pdu, Message response) { - Log.d(LOG_TAG, "Write SMS to RUIM with status " + status); + Rlog.d(LOG_TAG, "Write SMS to RUIM with status " + status); unimplemented(response); } @@ -1321,7 +1321,7 @@ public final class SimulatedCommands extends BaseCommands } pausedResponses.clear(); } else { - Log.e("GSM", "SimulatedCommands.resumeResponses < 0"); + Rlog.e("GSM", "SimulatedCommands.resumeResponses < 0"); } } @@ -1365,44 +1365,44 @@ public final class SimulatedCommands extends BaseCommands // ***** Methods for CDMA support public void getDeviceIdentity(Message response) { - Log.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); + Rlog.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); unimplemented(response); } public void getCDMASubscription(Message response) { - Log.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); + Rlog.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); unimplemented(response); } public void setCdmaSubscriptionSource(int cdmaSubscriptionType, Message response) { - Log.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); + Rlog.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); unimplemented(response); } public void queryCdmaRoamingPreference(Message response) { - Log.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); + Rlog.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); unimplemented(response); } public void setCdmaRoamingPreference(int cdmaRoamingType, Message response) { - Log.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); + Rlog.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); unimplemented(response); } public void setPhoneType(int phoneType) { - Log.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); + Rlog.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); } public void getPreferredVoicePrivacy(Message result) { - Log.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); + Rlog.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); unimplemented(result); } public void setPreferredVoicePrivacy(boolean enable, Message result) { - Log.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); + Rlog.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); unimplemented(result); } @@ -1417,7 +1417,7 @@ public final class SimulatedCommands extends BaseCommands * @param response is callback message */ public void setTTYMode(int ttyMode, Message response) { - Log.w(LOG_TAG, "Not implemented in SimulatedCommands"); + Rlog.w(LOG_TAG, "Not implemented in SimulatedCommands"); unimplemented(response); } @@ -1432,7 +1432,7 @@ public final class SimulatedCommands extends BaseCommands * @param response is callback message */ public void queryTTYMode(Message response) { - Log.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); + Rlog.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); unimplemented(response); } @@ -1440,7 +1440,7 @@ public final class SimulatedCommands extends BaseCommands * {@inheritDoc} */ public void sendCDMAFeatureCode(String FeatureCode, Message response) { - Log.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); + Rlog.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); unimplemented(response); } @@ -1448,7 +1448,7 @@ public final class SimulatedCommands extends BaseCommands * {@inheritDoc} */ public void sendCdmaSms(byte[] pdu, Message response){ - Log.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); + Rlog.w(LOG_TAG, "CDMA not implemented in SimulatedCommands"); } public void setCdmaBroadcastActivation(boolean activate, Message response) { diff --git a/src/java/com/android/internal/telephony/test/SimulatedGsmCallState.java b/src/java/com/android/internal/telephony/test/SimulatedGsmCallState.java index c6c301d24..6b0a3461e 100644 --- a/src/java/com/android/internal/telephony/test/SimulatedGsmCallState.java +++ b/src/java/com/android/internal/telephony/test/SimulatedGsmCallState.java @@ -25,7 +25,7 @@ import com.android.internal.telephony.DriverCall; import java.util.List; import java.util.ArrayList; -import android.util.Log; +import android.telephony.Rlog; class CallInfo { enum State { @@ -189,7 +189,7 @@ class SimulatedGsmCallState extends Handler { && (call.state == CallInfo.State.INCOMING || call.state == CallInfo.State.WAITING) ) { - Log.w("ModelInterpreter", + Rlog.w("ModelInterpreter", "triggerRing failed; phone already ringing"); return false; } else if (call != null) { @@ -198,7 +198,7 @@ class SimulatedGsmCallState extends Handler { } if (empty < 0 ) { - Log.w("ModelInterpreter", "triggerRing failed; all full"); + Rlog.w("ModelInterpreter", "triggerRing failed; all full"); return false; } @@ -658,25 +658,25 @@ class SimulatedGsmCallState extends Handler { CallInfo call; int freeSlot = -1; - Log.d("GSM", "SC> dial '" + address + "'"); + Rlog.d("GSM", "SC> dial '" + address + "'"); if (nextDialFailImmediately) { nextDialFailImmediately = false; - Log.d("GSM", "SC< dial fail (per request)"); + Rlog.d("GSM", "SC< dial fail (per request)"); return false; } String phNum = PhoneNumberUtils.extractNetworkPortion(address); if (phNum.length() == 0) { - Log.d("GSM", "SC< dial fail (invalid ph num)"); + Rlog.d("GSM", "SC< dial fail (invalid ph num)"); return false; } // Ignore setting up GPRS if (phNum.startsWith("*99") && phNum.endsWith("#")) { - Log.d("GSM", "SC< dial ignored (gprs)"); + Rlog.d("GSM", "SC< dial ignored (gprs)"); return true; } @@ -684,11 +684,11 @@ class SimulatedGsmCallState extends Handler { // a new call try { if (countActiveLines() > 1) { - Log.d("GSM", "SC< dial fail (invalid call state)"); + Rlog.d("GSM", "SC< dial fail (invalid call state)"); return false; } } catch (InvalidStateEx ex) { - Log.d("GSM", "SC< dial fail (invalid call state)"); + Rlog.d("GSM", "SC< dial fail (invalid call state)"); return false; } @@ -700,7 +700,7 @@ class SimulatedGsmCallState extends Handler { if (calls[i] != null && !calls[i].isActiveOrHeld()) { // Can't make outgoing calls when there is a ringing or // connecting outgoing call - Log.d("GSM", "SC< dial fail (invalid call state)"); + Rlog.d("GSM", "SC< dial fail (invalid call state)"); return false; } else if (calls[i] != null && calls[i].state == CallInfo.State.ACTIVE) { // All active calls behome held @@ -709,7 +709,7 @@ class SimulatedGsmCallState extends Handler { } if (freeSlot < 0) { - Log.d("GSM", "SC< dial fail (invalid call state)"); + Rlog.d("GSM", "SC< dial fail (invalid call state)"); return false; } @@ -721,7 +721,7 @@ class SimulatedGsmCallState extends Handler { CONNECTING_PAUSE_MSEC); } - Log.d("GSM", "SC< dial (slot = " + freeSlot + ")"); + Rlog.d("GSM", "SC< dial (slot = " + freeSlot + ")"); return true; } @@ -741,7 +741,7 @@ class SimulatedGsmCallState extends Handler { } } - Log.d("GSM", "SC< getDriverCalls " + ret); + Rlog.d("GSM", "SC< getDriverCalls " + ret); return ret; } @@ -779,12 +779,12 @@ class SimulatedGsmCallState extends Handler { } else if (call.isMpty && mptyIsHeld && call.state == CallInfo.State.ACTIVE ) { - Log.e("ModelInterpreter", "Invalid state"); + Rlog.e("ModelInterpreter", "Invalid state"); throw new InvalidStateEx(); } else if (!call.isMpty && hasMpty && mptyIsHeld && call.state == CallInfo.State.HOLDING ) { - Log.e("ModelInterpreter", "Invalid state"); + Rlog.e("ModelInterpreter", "Invalid state"); throw new InvalidStateEx(); } diff --git a/src/java/com/android/internal/telephony/uicc/UiccController.java b/src/java/com/android/internal/telephony/uicc/UiccController.java index 8d0868e51..d0ebb3d3a 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccController.java +++ b/src/java/com/android/internal/telephony/uicc/UiccController.java @@ -22,7 +22,7 @@ import android.os.Handler; import android.os.Message; import android.os.Registrant; import android.os.RegistrantList; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.IccCardStatus; @@ -185,7 +185,7 @@ public class UiccController extends Handler { onGetIccCardStatusDone(ar); break; default: - Log.e(LOG_TAG, " Unknown Event " + msg.what); + Rlog.e(LOG_TAG, " Unknown Event " + msg.what); } } } @@ -201,7 +201,7 @@ public class UiccController extends Handler { private synchronized void onGetIccCardStatusDone(AsyncResult ar) { if (ar.exception != null) { - Log.e(LOG_TAG,"Error getting ICC status. " + Rlog.e(LOG_TAG,"Error getting ICC status. " + "RIL_REQUEST_GET_ICC_STATUS should " + "never return an error", ar.exception); return; @@ -222,6 +222,6 @@ public class UiccController extends Handler { } private void log(String string) { - Log.d(LOG_TAG, string); + Rlog.d(LOG_TAG, string); } } diff --git a/tests/telephonytests/src/com/android/internal/telephony/MccTableTest.java b/tests/telephonytests/src/com/android/internal/telephony/MccTableTest.java index 868c76d5b..e6dee8b53 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/MccTableTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/MccTableTest.java @@ -21,7 +21,7 @@ import com.android.internal.telephony.MccTable; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; -import android.util.Log; +import android.telephony.Rlog; public class MccTableTest extends AndroidTestCase { private final static String LOG_TAG = "GSM"; diff --git a/tests/telephonytests/src/com/android/internal/telephony/SmsMessageBodyTest.java b/tests/telephonytests/src/com/android/internal/telephony/SmsMessageBodyTest.java index b84865737..36bad229d 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/SmsMessageBodyTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/SmsMessageBodyTest.java @@ -18,11 +18,11 @@ package com.android.internal.telephony; import android.telephony.SmsMessage; import android.telephony.TelephonyManager; +import android.telephony.Rlog; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.LargeTest; import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.SmallTest; -import android.util.Log; import com.android.internal.telephony.SmsConstants; @@ -480,9 +480,9 @@ public class SmsMessageBodyTest extends AndroidTestCase { } void printStats() { - Log.d(TAG, "Unicode selection count: " + mUnicodeCounter); + Rlog.d(TAG, "Unicode selection count: " + mUnicodeCounter); for (int i = 0; i < 12; i++) { - Log.d(TAG, "Language pair index " + i + " count: " + mStatsCounters[i]); + Rlog.d(TAG, "Language pair index " + i + " count: " + mStatsCounters[i]); } } } @@ -517,7 +517,7 @@ public class SmsMessageBodyTest extends AndroidTestCase { ch.addChar(charClass); // if (i % 20 == 0) { -// Log.d(TAG, "test string: " + sb); +// Rlog.d(TAG, "test string: " + sb); // } // Test string against all combinations of enabled languages @@ -537,13 +537,13 @@ public class SmsMessageBodyTest extends AndroidTestCase { // after 10 iterations with a Unicode-only string, skip to next test string // so we can spend more time testing strings that do encode into 7 bits. if (unicodeOnly && ++unicodeOnlyCount == 10) { -// Log.d(TAG, "Unicode only: skipping to next test string"); +// Rlog.d(TAG, "Unicode only: skipping to next test string"); break; } } } ch.printStats(); - Log.d(TAG, "Completed in " + (System.currentTimeMillis() - startTime) + " ms"); + Rlog.d(TAG, "Completed in " + (System.currentTimeMillis() - startTime) + " ms"); GsmAlphabet.setEnabledLockingShiftTables(origLockingShiftTables); GsmAlphabet.setEnabledSingleShiftTables(origSingleShiftTables); } diff --git a/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java b/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java index a95f60c75..f74400c34 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java @@ -21,7 +21,7 @@ import android.telephony.SmsCbCmasInfo; import android.telephony.SmsCbMessage; import android.telephony.cdma.CdmaSmsCbProgramData; import android.test.AndroidTestCase; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.GsmAlphabet; import com.android.internal.telephony.IccUtils; @@ -525,7 +525,7 @@ public class CdmaSmsCbTest extends AndroidTestCase { for (int i = 0; i < len; i++) { data[i] = (byte) r.nextInt(256); } - // Log.d("CdmaSmsCbTest", "trying random bearer data run " + run + " length " + len); + // Rlog.d("CdmaSmsCbTest", "trying random bearer data run " + run + " length " + len); try { int category = 0x0ff0 + r.nextInt(32); // half CMAS, half non-CMAS Parcel p = createBroadcastParcel(category); @@ -533,10 +533,10 @@ public class CdmaSmsCbTest extends AndroidTestCase { SmsCbMessage cbMessage = msg.parseBroadcastSms(); // with random input, cbMessage will almost always be null (log when it isn't) if (cbMessage != null) { - Log.d("CdmaSmsCbTest", "success: " + cbMessage); + Rlog.d("CdmaSmsCbTest", "success: " + cbMessage); } } catch (Exception e) { - Log.d("CdmaSmsCbTest", "exception thrown", e); + Rlog.d("CdmaSmsCbTest", "exception thrown", e); fail("Exception in decoder at run " + run + " length " + len + ": " + e); } } @@ -549,7 +549,7 @@ public class CdmaSmsCbTest extends AndroidTestCase { int category = 0x0ff0 + r.nextInt(32); // half CMAS, half non-CMAS Parcel p = createBroadcastParcel(category); int len = r.nextInt(140); - // Log.d("CdmaSmsCbTest", "trying random user data run " + run + " length " + len); + // Rlog.d("CdmaSmsCbTest", "trying random user data run " + run + " length " + len); try { BitwiseOutputStream bos = createBearerDataStream(r.nextInt(65536), r.nextInt(4), @@ -565,7 +565,7 @@ public class CdmaSmsCbTest extends AndroidTestCase { SmsMessage msg = createMessageFromParcel(p, bos.toByteArray()); SmsCbMessage cbMessage = msg.parseBroadcastSms(); } catch (Exception e) { - Log.d("CdmaSmsCbTest", "exception thrown", e); + Rlog.d("CdmaSmsCbTest", "exception thrown", e); fail("Exception in decoder at run " + run + " length " + len + ": " + e); } } diff --git a/tests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java b/tests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java index fb8a5d9eb..aa94e0e10 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java +++ b/tests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java @@ -22,7 +22,7 @@ import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; import android.os.Message; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.gsm.GSMPhone; import com.android.internal.telephony.test.SimulatedCommands; diff --git a/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java b/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java index 82c6944e1..656cbcc5b 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java @@ -16,11 +16,11 @@ package com.android.internal.telephony.gsm; +import android.telephony.Rlog; import android.telephony.SmsCbEtwsInfo; import android.telephony.SmsCbLocation; import android.telephony.SmsCbMessage; import android.test.AndroidTestCase; -import android.util.Log; import com.android.internal.telephony.IccUtils; @@ -709,7 +709,7 @@ public class GsmSmsCbTest extends AndroidTestCase { public void testEtwsMessageNormal() { SmsCbMessage msg = createFromPdu(etwsMessageNormal); - Log.d(TAG, msg.toString()); + Rlog.d(TAG, msg.toString()); assertEquals("GS mismatch", 0, msg.getGeographicalScope()); assertEquals("serial number mismatch", 0, msg.getSerialNumber()); assertEquals("message ID mismatch", 0x1100, msg.getServiceCategory()); @@ -719,7 +719,7 @@ public class GsmSmsCbTest extends AndroidTestCase { public void testEtwsMessageCancel() { SmsCbMessage msg = createFromPdu(etwsMessageCancel); - Log.d(TAG, msg.toString()); + Rlog.d(TAG, msg.toString()); assertEquals("GS mismatch", 0, msg.getGeographicalScope()); assertEquals("serial number mismatch", 0, msg.getSerialNumber()); assertEquals("message ID mismatch", 0x1100, msg.getServiceCategory()); @@ -729,7 +729,7 @@ public class GsmSmsCbTest extends AndroidTestCase { public void testEtwsMessageTest() { SmsCbMessage msg = createFromPdu(etwsMessageTest); - Log.d(TAG, msg.toString()); + Rlog.d(TAG, msg.toString()); assertEquals("GS mismatch", 0, msg.getGeographicalScope()); assertEquals("serial number mismatch", 0, msg.getSerialNumber()); assertEquals("message ID mismatch", 0x1103, msg.getServiceCategory()); @@ -750,7 +750,7 @@ public class GsmSmsCbTest extends AndroidTestCase { // this should return a SmsCbMessage object or null for invalid data SmsCbMessage msg = createFromPdu(data); } catch (Exception e) { - Log.d(TAG, "exception thrown", e); + Rlog.d(TAG, "exception thrown", e); fail("Exception in decoder at run " + run + " length " + len + ": " + e); } } diff --git a/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java b/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java index ea6836dec..a85880633 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java +++ b/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java @@ -20,7 +20,7 @@ import android.content.Context; import android.os.AsyncResult; import android.os.Message; import android.os.SystemClock; -import android.util.Log; +import android.telephony.Rlog; import com.android.internal.telephony.BaseCommands; import com.android.internal.telephony.IccIoResult; @@ -105,7 +105,7 @@ class UsimDataDownloadCommands extends BaseCommands { @Override public synchronized void acknowledgeLastIncomingGsmSms(boolean success, int cause, Message response) { - Log.d(TAG, "acknowledgeLastIncomingGsmSms: success=" + success + ", cause=" + cause); + Rlog.d(TAG, "acknowledgeLastIncomingGsmSms: success=" + success + ", cause=" + cause); Assert.assertTrue("unexpected call to acknowledge SMS", mExpectingAcknowledgeGsmSms); Assert.assertEquals(mExpectingAcknowledgeGsmSmsSuccess, success); Assert.assertEquals(mExpectingAcknowledgeGsmSmsFailureCause, cause); @@ -120,7 +120,7 @@ class UsimDataDownloadCommands extends BaseCommands { @Override public synchronized void acknowledgeIncomingGsmSmsWithPdu(boolean success, String ackPdu, Message response) { - Log.d(TAG, "acknowledgeLastIncomingGsmSmsWithPdu: success=" + success + Rlog.d(TAG, "acknowledgeLastIncomingGsmSmsWithPdu: success=" + success + ", ackPDU= " + ackPdu); Assert.assertTrue("unexpected call to acknowledge SMS", mExpectingAcknowledgeGsmSms); Assert.assertEquals(mExpectingAcknowledgeGsmSmsSuccess, success); @@ -140,7 +140,7 @@ class UsimDataDownloadCommands extends BaseCommands { for (int i = 0; i < contents.length(); i += 2) { builder.append(contents.charAt(i)).append(contents.charAt(i+1)).append(' '); } - Log.d(TAG, "sendEnvelopeWithStatus: " + builder.toString()); + Rlog.d(TAG, "sendEnvelopeWithStatus: " + builder.toString()); Assert.assertTrue("unexpected call to send envelope", mExpectingSendEnvelope); Assert.assertEquals(mExpectingSendEnvelopeContents, contents); diff --git a/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java b/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java index 6c8ba5e1e..7f0282af7 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java @@ -18,7 +18,7 @@ package com.android.internal.telephony.gsm; import android.os.HandlerThread; import android.test.AndroidTestCase; -import android.util.Log; +import android.telephony.Rlog; import java.nio.charset.Charset; @@ -67,7 +67,7 @@ public class UsimDataDownloadTest extends AndroidTestCase { mHandlerThread = new TestHandlerThread(); mHandlerThread.start(); mHandler = mHandlerThread.getHandler(); - Log.d(TAG, "mHandler is constructed"); + Rlog.d(TAG, "mHandler is constructed"); } @Override |