commit 4281a68db7ee0925c4b1b97110cc0e109737cad5
author Wink Saville <wink@google.com> Tue Mar 22 16:07:23 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 22 16:07:23 2011 -0700
tree 146e80e7e1ad69c2f492d9030da1f758fcc92375
parent b9be452020775051ff985ff99a172ca1447d1399
parent a97f49c02b68d94119f5171472bbadbbad26ba14

am a97f49c0: Merge "Tweak RIL.java debug." into honeycomb-LTE

* commit 'a97f49c02b68d94119f5171472bbadbbad26ba14':
  Tweak RIL.java debug.

telephony/java/com/android/internal/telephony/RIL.java

diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java
index 88aed28..1d47405 100644
--- a/telephony/java/com/android/internal/telephony/RIL.java
+++ b/telephony/java/com/android/internal/telephony/RIL.java
@@ -207,9 +207,8 @@
  */
 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 @@
                 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 @@
             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;