summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorJeff Davidson <jpd@google.com>2014-08-15 21:56:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-15 21:23:40 +0000
commitcab3eb0c0b29d8c4b58652c40687a5a4309f94ef (patch)
treeb35125fce5f29f35212057dc3c37b03099031f9b /core/java/android/provider
parenta69adf7535d6a7cbe49ac7aad4322524425200e9 (diff)
parent56f9f73a5aad38aa777ec9a42c859e687f2d2af1 (diff)
downloadframeworks_base-cab3eb0c0b29d8c4b58652c40687a5a4309f94ef.zip
frameworks_base-cab3eb0c0b29d8c4b58652c40687a5a4309f94ef.tar.gz
frameworks_base-cab3eb0c0b29d8c4b58652c40687a5a4309f94ef.tar.bz2
Merge "Fix default scorer provisioning." into lmp-dev
Diffstat (limited to 'core/java/android/provider')
-rw-r--r--core/java/android/provider/Settings.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index c2a3012..e075d8b 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6470,6 +6470,14 @@ public final class Settings {
public static final String GUEST_USER_ENABLED = "guest_user_enabled";
/**
+ * Whether the NetworkScoringService has been first initialized.
+ * <p>
+ * Type: int (0 for false, 1 for true)
+ * @hide
+ */
+ public static final String NETWORK_SCORING_PROVISIONED = "network_scoring_provisioned";
+
+ /**
* Settings to backup. This is here so that it's in the same place as the settings
* keys and easy to update.
*