From ba4e877905cca9656d9f13030625717619bc163c Mon Sep 17 00:00:00 2001
From: Akinobu Nakashima <akinobu.x.nakashima@sonymobile.com>
Date: Fri, 1 Jun 2018 16:35:10 +0900
Subject: [PATCH] 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
(cherry picked from commit 37e702861579fddfd275143c2421ca53f27cb41c)
---
 core/java/android/net/Uri.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java
index 437153b5e010..0fb84b723634 100644
--- a/core/java/android/net/Uri.java
+++ b/core/java/android/net/Uri.java
@@ -384,7 +384,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
         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(':');
-- 
2.11.0