commit 7b960c8adc35113c6eb3fad6cdfe32c2169d380b
author Amit Mahajan <amitmahajan@google.com> Tue Oct 14 12:11:25 2014 -0700
committer Amit Mahajan <amitmahajan@google.com> Tue Oct 14 16:50:25 2014 -0700
tree 6f315d1948f4849b25ef866b0c0cb4a149ad3b61
parent 8eb4b07b8535c04901cc46dc7860c87aa9e9fbfc

Hide sensitive payload from logging.

For:
RIL_REQUEST_SIM_OPEN_CHANNEL
RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL
UNSOL_STK_EVENT_NOTIFY
UNSOL_STK_PROACTIVE_COMMAND

Bug: 17984085
Change-Id: I8b83ae0d85792636bae0b7e0f57b0ea6e5cb33d9

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

diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index 69ff32d..0789b66 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -2631,6 +2631,9 @@
             case RIL_REQUEST_GET_IMSI:
             case RIL_REQUEST_GET_IMEI:
             case RIL_REQUEST_GET_IMEISV:
+            case RIL_REQUEST_SIM_OPEN_CHANNEL:
+            case RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL:
+
                 if (!RILJ_LOGV) {
                     // If not versbose logging just return and don't display IMSI and IMEI, IMEISV
                     return "";
@@ -2902,7 +2905,7 @@
                 break;
 
             case RIL_UNSOL_STK_PROACTIVE_COMMAND:
-                if (RILJ_LOGD) unsljLogRet(response, ret);
+                if (RILJ_LOGD) unsljLog(response);
 
                 if (mCatProCmdRegistrant != null) {
                     mCatProCmdRegistrant.notifyRegistrant(
@@ -2911,7 +2914,7 @@
                 break;
 
             case RIL_UNSOL_STK_EVENT_NOTIFY:
-                if (RILJ_LOGD) unsljLogRet(response, ret);
+                if (RILJ_LOGD) unsljLog(response);
 
                 if (mCatEventRegistrant != null) {
                     mCatEventRegistrant.notifyRegistrant(