Commit 3e453e2c authored Jul 08, 2021 by TreeHugger Robot Committed by Automerger Merge Worker Jul 08, 2021

Merge "[SettingsProvider] make nfc_payment_default_component readable" into...

Merge "[SettingsProvider] make nfc_payment_default_component readable" into sc-dev am: 576c548b am: 4a1bc2ab

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235880

Change-Id: I0759014699230862df7b02127e30018539d960a6

core/java/android/provider/Settings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -8750,6 +8750,7 @@ public final class Settings {
		*/
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		@TestApi
		@Readable
		public static final String NFC_PAYMENT_DEFAULT_COMPONENT = "nfc_payment_default_component";

		/**