summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorYueming Wang <yuemingw@google.com>2018-11-29 01:55:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-11-29 01:55:20 +0000
commit3a329573f1ddfb4e98b140e8cc176d5cda19727e (patch)
treef6a9bca472ae69f286590bb38d02cc5ac47a71c3 /core/java
parenta248a6a08bb1d5b93592717fd617db1369c001c1 (diff)
parent4446ca6fa51ba7e0e48ac10c518776f5d2a47067 (diff)
Merge "Add a secure settings for cross profile calendar feature."
Diffstat (limited to 'core/java')
-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 4369ea2a6693..f1377a9ceced 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7967,6 +7967,14 @@ public final class Settings {
"managed_profile_contact_remote_search";
/**
+ * Whether parent profile can access remote calendar data in managed profile.
+ *
+ * @hide
+ */
+ public static final String CROSS_PROFILE_CALENDAR_ENABLED =
+ "cross_profile_calendar_enabled";
+
+ /**
* Whether or not the automatic storage manager is enabled and should run on the device.
*
* @hide