Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a329573 authored by Yueming Wang's avatar Yueming Wang Committed by Android (Google) Code Review
Browse files

Merge "Add a secure settings for cross profile calendar feature."

parents a248a6a0 4446ca6f

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -7966,6 +7966,14 @@ public final class Settings { 
        public static final String MANAGED_PROFILE_CONTACT_REMOTE_SEARCH =

                "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.















         *

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -662,7 +662,8 @@ public class SettingsBackupTest {













                 Settings.Secure.SUPPRESS_AUTO_BATTERY_SAVER_SUGGESTION,















                 Settings.Secure.PACKAGES_TO_CLEAR_DATA_BEFORE_FULL_RESTORE,















                 Settings.Secure.FLASHLIGHT_AVAILABLE,













                 Settings.Secure.FLASHLIGHT_ENABLED);













                 Settings.Secure.FLASHLIGHT_ENABLED,













                 Settings.Secure.CROSS_PROFILE_CALENDAR_ENABLED);































    @Test















    public void systemSettingsBackedUpOrBlacklisted() {