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

2016-07-26 17:00:17 +00:00
parent 4e40413c50 a7ab821aa1
commit a0f07728d9
1 changed files with 8 additions and 0 deletions
--- a/telephony/java/android/telephony/Rlog.java
+++ b/telephony/java/android/telephony/Rlog.java
@@ -85,5 +85,13 @@ public final class Rlog {
        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");
+    }
+
 }