am 8fd521c7: am 95b1bbfe: Merge "Fix the build" into klp-dev

* commit '8fd521c7447a6f95006adb56cfa60ff49e1befab':
  Fix the build

1 files changed, 14 insertions, 0 deletions

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index cf1c271e6de3..73d9dfb3eaa3 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4465,6 +4465,20 @@ public final class Settings {
         public static final String TRANSIENT_NAV_CONFIRMATIONS = "transient_nav_confirmations";
 
         /**
+         * This is the query URI for finding a print service to install.
+         *
+         * @hide
+         */
+        public static final String PRINT_SERVICE_SEARCH_URI = "print_service_search_uri";
+
+        /**
+         * This is the query URI for finding a NFC payment service to install.
+         *
+         * @hide
+         */
+        public static final String PAYMENT_SERVICE_SEARCH_URI = "payment_service_search_uri";
+
+        /**
          * This are the settings to be backed up.
          *
          * NOTE: Settings are backed up and restored in the order they appear