Merge "Fix the build" into klp-dev

2013-10-01 00:36:56 +00:00
parent 5e65adaf41 f43e851f96
commit 95b1bbfe6c
1 changed files with 14 additions and 0 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4373,6 +4373,20 @@ public final class Settings {
        /** @hide */
        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.
         *