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

Commit a0735118 authored by Geremy Condra's avatar Geremy Condra
Browse files

Add ConfigUpdater settings values to the global table. 

This is a partial fix to a bug caused by not properly migrating
these values from secure: to global:

Change-Id: Iaed77b5ab671f9cd229c7883ae09a0b4a5f3c64e
parent 8594fab8

core/java/android/provider/Settings.java

+58 −0
Original line number Diff line number Diff line
@@ -984,6 +984,14 @@ public final class Settings { 
            MOVED_TO_GLOBAL.add(Settings.Global.WAIT_FOR_DEBUGGER);

            MOVED_TO_GLOBAL.add(Settings.Global.SHOW_PROCESSES);

            MOVED_TO_GLOBAL.add(Settings.Global.ALWAYS_FINISH_ACTIVITIES);

            MOVED_TO_GLOBAL.add(Settings.Global.TZINFO_UPDATE_CONTENT_URL);

            MOVED_TO_GLOBAL.add(Settings.Global.TZINFO_UPDATE_METADATA_URL);

            MOVED_TO_GLOBAL.add(Settings.Global.SELINUX_UPDATE_CONTENT_URL);

            MOVED_TO_GLOBAL.add(Settings.Global.SELINUX_UPDATE_METADATA_URL);

            MOVED_TO_GLOBAL.add(Settings.Global.SMS_SHORT_CODES_UPDATE_CONTENT_URL);

            MOVED_TO_GLOBAL.add(Settings.Global.SMS_SHORT_CODES_UPDATE_METADATA_URL);

            MOVED_TO_GLOBAL.add(Settings.Global.CERT_PIN_UPDATE_CONTENT_URL);

            MOVED_TO_GLOBAL.add(Settings.Global.CERT_PIN_UPDATE_METADATA_URL);

        }



        /** @hide */
@@ -5347,6 +5355,56 @@ public final class Settings { 
         */

        public static final String AUDIO_SAFE_VOLUME_STATE = "audio_safe_volume_state";



        /**

         * URL for tzinfo (time zone) updates

         * @hide

         */

        public static final String TZINFO_UPDATE_CONTENT_URL = "tzinfo_content_url";



        /**

         * URL for tzinfo (time zone) update metadata

         * @hide

         */

        public static final String TZINFO_UPDATE_METADATA_URL = "tzinfo_metadata_url";



        /**

         * URL for selinux (mandatory access control) updates

         * @hide

         */

        public static final String SELINUX_UPDATE_CONTENT_URL = "selinux_content_url";



        /**

         * URL for selinux (mandatory access control) update metadata

         * @hide

         */

        public static final String SELINUX_UPDATE_METADATA_URL = "selinux_metadata_url";



        /**

         * URL for sms short code updates

         * @hide

         */

        public static final String SMS_SHORT_CODES_UPDATE_CONTENT_URL =

                "sms_short_codes_content_url";



        /**

         * URL for sms short code update metadata

         * @hide

         */

        public static final String SMS_SHORT_CODES_UPDATE_METADATA_URL =

                "sms_short_codes_metadata_url";



        /**

         * URL for cert pinlist updates

         * @hide

         */

        public static final String CERT_PIN_UPDATE_CONTENT_URL = "cert_pin_content_url";



        /**

         * URL for cert pinlist updates

         * @hide

         */

        public static final String CERT_PIN_UPDATE_METADATA_URL = "cert_pin_metadata_url";



        /**

         * Settings to backup. This is here so that it's in the same place as the settings

         * keys and easy to update.