summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-08-14 18:49:48 -0700
committerAmith Yamasani <yamasani@google.com>2014-08-15 13:42:21 -0700
commit4f7e2e334e4ca5f1a67baf4bdd40cd080b954161 (patch)
treed911f9615a1df6ddb00663b00c9ee0219b18afd7 /core/java/android/provider
parentf0433e50c7855579ad9847e939bb2c84e576e9d0 (diff)
downloadframeworks_base-4f7e2e334e4ca5f1a67baf4bdd40cd080b954161.zip
frameworks_base-4f7e2e334e4ca5f1a67baf4bdd40cd080b954161.tar.gz
frameworks_base-4f7e2e334e4ca5f1a67baf4bdd40cd080b954161.tar.bz2
Copy certain settings to the managed profile
All reads of those specific settings will go to the primary user. Inserts to primary also go to managed profiles in order to notify any observers. This enables Location settings to be shared by both profiles. Also some other settings related to IME and Accessibility since those services are shared across the profiles. Bug: 16457210 Change-Id: Ib8fd697b5c78027fcbaf245d82dda5e6d6aab4f0
Diffstat (limited to 'core/java/android/provider')
-rw-r--r--core/java/android/provider/Settings.java30
1 files changed, 30 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 8886559..c2a3012 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2667,6 +2667,16 @@ public final class Settings {
};
/**
+ * These entries are considered common between the personal and the managed profile,
+ * since the managed profile doesn't get to change them.
+ * @hide
+ */
+ public static final String[] CLONE_TO_MANAGED_PROFILE = {
+ DATE_FORMAT,
+ TIME_12_24
+ };
+
+ /**
* When to use Wi-Fi calling
*
* @see android.telephony.TelephonyManager.WifiCallingChoices
@@ -4797,6 +4807,26 @@ public final class Settings {
};
/**
+ * These entries are considered common between the personal and the managed profile,
+ * since the managed profile doesn't get to change them.
+ * @hide
+ */
+ public static final String[] CLONE_TO_MANAGED_PROFILE = {
+ ACCESSIBILITY_ENABLED,
+ ALLOW_MOCK_LOCATION,
+ ALLOWED_GEOLOCATION_ORIGINS,
+ DEFAULT_INPUT_METHOD,
+ ENABLED_ACCESSIBILITY_SERVICES,
+ ENABLED_INPUT_METHODS,
+ LOCATION_MODE,
+ LOCATION_PROVIDERS_ALLOWED,
+ LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
+ SELECTED_INPUT_METHOD_SUBTYPE,
+ SELECTED_SPELL_CHECKER,
+ SELECTED_SPELL_CHECKER_SUBTYPE
+ };
+
+ /**
* Helper method for determining if a location provider is enabled.
*
* @param cr the content resolver to use