Merge "Merge "Suppress AID log on adb logcat" am: e72aecb655 am: 3acdcfda75" into pi-dev-plus-aosp

1 files changed, 1 insertions, 1 deletions

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(':');