From 73ff7d8e64bb92be03e3e7ab35cdba2963c3d823 Mon Sep 17 00:00:00 2001 From: Santos Cordon Date: Wed, 6 Mar 2013 17:24:11 -0800 Subject: Obfuscate any phone numbers that pass through the event log. bug: 8203219 Change-Id: I455849cab9b2a8e08889cf44d1799448846c9151 --- services/java/com/android/server/am/ActivityStack.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index 526b24f052b3..5902f2176a84 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -47,6 +47,7 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; +import android.net.Uri; import android.os.Binder; import android.os.Bundle; import android.os.Handler; @@ -4597,11 +4598,13 @@ final class ActivityStack { private final void logStartActivity(int tag, ActivityRecord r, TaskRecord task) { + final Uri data = r.intent.getData(); + final String strData = data != null ? data.toSafeString() : null; + EventLog.writeEvent(tag, r.userId, System.identityHashCode(r), task.taskId, r.shortComponentName, r.intent.getAction(), - r.intent.getType(), r.intent.getDataString(), - r.intent.getFlags()); + r.intent.getType(), strData, r.intent.getFlags()); } /** -- cgit v1.2.3-59-g8ed1b