commit 37e702861579fddfd275143c2421ca53f27cb41c
author Akinobu Nakashima <akinobu.x.nakashima@sonymobile.com> Fri Jun 01 16:35:10 2018 +0900
committer Hiroki Yamamoto <Hiroki.A.Yamamoto@sony.com> Fri Jun 01 07:47:57 2018 +0000
tree 3ef4676a99accd874454eb7d63ba22a8eab84c03
parent 186be90eb6dbbf1fe1ad28c8faca47e9b80997d8

Suppress AID log on adb logcat

When NFC event transaction intent is sent,
the device shows AID information on logcat.
But such information should not be shown for security reasons.

Test: Send NFC EventTransaction and check logcat
Bug: 80551185
Change-Id: I8d1f9c1946bb1514e3a6bfa70fff03be4525d6b5

core/java/android/net/Uri.java

diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java
index 1bb4adc..e1556b4 100644
--- a/core/java/android/net/Uri.java
+++ b/core/java/android/net/Uri.java
@@ -384,7 +384,7 @@
         if (scheme != null) {
             if (scheme.equalsIgnoreCase("tel") || scheme.equalsIgnoreCase("sip")
                     || scheme.equalsIgnoreCase("sms") || scheme.equalsIgnoreCase("smsto")
-                    || scheme.equalsIgnoreCase("mailto")) {
+                    || scheme.equalsIgnoreCase("mailto") || scheme.equalsIgnoreCase("nfc")) {
                 StringBuilder builder = new StringBuilder(64);
                 builder.append(scheme);
                 builder.append(':');