From 1d1a373f5c7637de545ad815ad21aa325aaa970f Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Sat, 19 Mar 2011 17:21:36 -0700 Subject: [PATCH] Tweak RIL.java debug. Changed the one use of DBG to RILJ_LOGD and make RILJ_LOGV a STOPSHIP if true. I then use that to output IMSI, IMEI and IMEISV to assist in initial bring up of RIL's. Change-Id: Ieb9d1120f76c89c130cbecb2992603fc6af71b96 --- .../java/com/android/internal/telephony/RIL.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java index 88aed28384c51..1d474052a8fe0 100644 --- a/telephony/java/com/android/internal/telephony/RIL.java +++ b/telephony/java/com/android/internal/telephony/RIL.java @@ -207,9 +207,8 @@ class RILRequest { */ public final class RIL extends BaseCommands implements CommandsInterface { static final String LOG_TAG = "RILJ"; - private static final boolean DBG = false; - static final boolean RILJ_LOGD = Config.LOGD; - static final boolean RILJ_LOGV = DBG ? Config.LOGD : Config.LOGV; + static final boolean RILJ_LOGD = true; + static final boolean RILJ_LOGV = false; // STOP SHIP if true /** * Wake lock timeout should be longer than the longest timeout in @@ -2069,7 +2068,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { if (RILJ_LOGD) Log.d(LOG_TAG, "Radio ON @ init; reset to OFF"); setRadioPower(false, null); } else { - if (DBG) Log.d(LOG_TAG, "Radio OFF @ init"); + if (RILJ_LOGD) Log.d(LOG_TAG, "Radio OFF @ init"); setRadioState(newState); setPreferredNetworkType(mNetworkMode, null); } @@ -2366,7 +2365,10 @@ public final class RIL extends BaseCommands implements CommandsInterface { case RIL_REQUEST_GET_IMSI: case RIL_REQUEST_GET_IMEI: case RIL_REQUEST_GET_IMEISV: - return ""; + if (!RILJ_LOGV) { + // If not versbose logging just return and don't display IMSI and IMEI, IMEISV + return ""; + } } StringBuilder sb;