commit a0f07728d9b706c50c79faa7fd4559de1410fcb6
author Chen Xu <fionaxu@google.com> Tue Jul 26 17:00:17 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 26 17:00:18 2016 +0000
tree 932da339072f8b294ffe4d682bbc5ee41b1c1137
parent 4e40413c5069b1e6e4a4647269d8cd52f356a824
parent a7ab821aa12c9a291ad5086d7eb816932b349ea1

Merge "add pii support for Rlog" into nyc-mr1-dev

telephony/java/android/telephony/Rlog.java

diff --git a/telephony/java/android/telephony/Rlog.java b/telephony/java/android/telephony/Rlog.java
index 2a7f7af..b4f400f 100644
--- a/telephony/java/android/telephony/Rlog.java
+++ b/telephony/java/android/telephony/Rlog.java
@@ -85,5 +85,13 @@
         return Log.isLoggable(tag, level);
     }
 
+    /**
+     * Redact personally identifiable information for production users.
+     * If log tag is loggable in verbose mode, return the original string, otherwise return XXX.
+     */
+    public static String pii(String tag, Object pii) {
+        return (isLoggable(tag, Log.VERBOSE) ? String.valueOf(pii) : "XXX");
+    }
+
 }