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

Commit 6bb8a966 authored by Felipe Leme's avatar Felipe Leme
Browse files

Inline some Settings constants so they don't break the SettingsBackupTest. 

Test: echo 'In TreeHugger we trust!'
Bug: 121153631

Change-Id: I7a1180a3446ba6a5aabb76fbe87113bf0e3096c6
parent a2ada8bf

core/java/android/provider/Settings.java

+5 −11
Original line number Diff line number Diff line
@@ -12954,12 +12954,11 @@ public final class Settings { 
         * <p>Possible values are:

         *

         * <ul>

         *   <li>If set to {@link #CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED_DEFAULT}, it will only

         *   be set if the OEM provides and defines the service name by overlaying

         *   {@code config_defaultContentCaptureService} (this is the "default" mode)

         *   <li>If set to {@link #CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED_ALWAYS}, it will

         *   always be enabled, even when the resource is not overlaid (this is useful during

         *   development and/or to run the CTS tests on AOSP builds).

         *   <li>If set to {@code default}, it will only be set if the OEM provides and defines the

         *   service name by overlaying {@code config_defaultContentCaptureService} (this is the

         *   "default" mode)

         *   <li>If set to {@code always}, it will always be enabled, even when the resource is not

         *   overlaid (this is useful during development and to run the CTS tests on AOSP builds).

         *   <li>Otherwise, it's explicitly disabled (this could work as a "kill switch" so OEMs

         *   can disable it remotely in case of emergency by setting to something else (like

         *   {@code "false"}); notice that it's also disabled if the OEM doesn't explicitly set one
@@ -12971,11 +12970,6 @@ public final class Settings { 
        public static final String CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED =

                "content_capture_service_explicitly_enabled";













        /** @hide */













        public static final String CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED_DEFAULT = "default";













        /** @hide */













        public static final String CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED_ALWAYS = "always";



























        /** {@hide} */















        public static final String ISOLATED_STORAGE_LOCAL = "isolated_storage_local";















        /** {@hide} */

































services/java/com/android/server/SystemServer.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -2125,11 +2125,11 @@ public final class SystemServer {













            return;















        }















        switch (settings) {













            case Settings.Global.CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED_ALWAYS:













            case "always":















                // Should be used only during development















                Slog.d(TAG, "ContentCaptureService explicitly enabled by Settings");















                break;













            case Settings.Global.CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED_DEFAULT:













            case "default":















                // Default case: check if OEM overlaid the resource that defines the service.















                final String serviceName = context.getString(















                        com.android.internal.R.string.config_defaultContentCaptureService);