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

This commit is contained in:
Android Build Merger (Role)
2018-06-06 00:26:40 +00:00
committed by Android (Google) Code Review

View File

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