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

Commit c9907ce3 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

New settings for testing permission controller 

The settings are used to reduce the runtime of the location access
permission controller tests.

Bug: 120303361
Test: atest CtsPermissionTestCases:android.permission.cts.LocationAccessCheckTest
      atest --test-mapping frameworks/base/core/java/android/provider/:presubmit
Change-Id: I47ed218dc0a300f73a1c0308fce60b61e6a423b0
parent a3e358cf

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -4637,6 +4637,8 @@ package android.provider { 
    field public static final java.lang.String HUSH_GESTURE_USED = "hush_gesture_used";

    field public static final java.lang.String INSTANT_APPS_ENABLED = "instant_apps_enabled";

    field public static final java.lang.String LAST_SETUP_SHOWN = "last_setup_shown";

    field public static final java.lang.String LOCATION_ACCESS_CHECK_DELAY_MILLIS = "location_access_check_delay_millis";

    field public static final java.lang.String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS = "location_access_check_interval_millis";

    field public static final java.lang.String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS = "lock_screen_allow_private_notifications";

    field public static final java.lang.String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications";

    field public static final java.lang.String MANUAL_RINGER_TOGGLE_COUNT = "manual_ringer_toggle_count";

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -998,6 +998,7 @@ package android.provider { 
  }



  public static final class Settings.Secure extends android.provider.Settings.NameValueTable {

    method public static void resetToDefaults(android.content.ContentResolver, java.lang.String);

    field public static final java.lang.String ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED = "accessibility_display_magnification_enabled";

    field public static final java.lang.String ACCESSIBILITY_SHORTCUT_TARGET_SERVICE = "accessibility_shortcut_target_service";

    field public static final java.lang.String AUTOFILL_FEATURE_FIELD_CLASSIFICATION = "autofill_field_classification";
@@ -1009,6 +1010,8 @@ package android.provider { 
    field public static final java.lang.String AUTOFILL_USER_DATA_MIN_VALUE_LENGTH = "autofill_user_data_min_value_length";

    field public static final java.lang.String DISABLED_PRINT_SERVICES = "disabled_print_services";

    field public static final deprecated java.lang.String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages";

    field public static final java.lang.String LOCATION_ACCESS_CHECK_DELAY_MILLIS = "location_access_check_delay_millis";

    field public static final java.lang.String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS = "location_access_check_interval_millis";

    field public static final java.lang.String SYNC_PARENT_SOUNDS = "sync_parent_sounds";

    field public static final java.lang.String USER_SETUP_COMPLETE = "user_setup_complete";

    field public static final java.lang.String VOICE_INTERACTION_SERVICE = "voice_interaction_service";

core/java/android/provider/Settings.java

+19 −0
Original line number Diff line number Diff line
@@ -5075,6 +5075,7 @@ public final class Settings { 
         * @hide

         */

        @SystemApi

        @TestApi

        @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)

        public static void resetToDefaults(@NonNull ContentResolver resolver,

                @Nullable String tag) {
@@ -8231,6 +8232,24 @@ public final class Settings { 
         */

        public static final String NOTIFICATION_NEW_INTERRUPTION_MODEL = "new_interruption_model";













        /**













         * How often to check for location access.













         * @hide













         */













        @SystemApi













        @TestApi













        public static final String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS =













                "location_access_check_interval_millis";

























        /**













         * Delay between granting location access and checking it.













         * @hide













         */













        @SystemApi













        @TestApi













        public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS =













                "location_access_check_delay_millis";



























        /**















         * This are the settings to be backed up.















         *

































core/java/android/provider/TEST_MAPPING
0 → 100644



+12
−0




























Original line number
Diff line number
Diff line













{













    "presubmit": [













        {













            "name": "FrameworksCoreTests",













            "options": [













                {













                    "include-filter": "android.provider.SettingsBackupTest"













                }













            ]













        }













    ]













}
























core/proto/android/providers/settings/secure.proto



+9
−1




























Original line number
Diff line number
Diff line








@@ -234,6 +234,14 @@ message SecureSettingsProto {













    }















    optional Location location = 31;





























    message LocationAccessCheck {













        option (android.msg_privacy).dest = DEST_EXPLICIT;



























        optional SettingProto interval_millis = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto delay_millis = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];













    }













    optional LocationAccessCheck location_access_check = 73;





























    message LockScreen {















        option (android.msg_privacy).dest = DEST_EXPLICIT;


























@@ -515,5 +523,5 @@ message SecureSettingsProto {





























    // Please insert fields in alphabetical order and group them into messages















    // if possible (to avoid reaching the method limit).













    // Next tag = 73;













    // Next tag = 74;















}