commit 6bb8a966831220e2a0b844fcdce6d9bb7637110b
author Felipe Leme <felipeal@google.com> Wed Dec 19 21:00:55 2018 -0800
committer Felipe Leme <felipeal@google.com> Wed Dec 19 21:04:28 2018 -0800
tree d95526c86b34c0c301f48ee32ed52e8ce9fa5f14
parent a2ada8bf6369726e0b032e9151903642de098ac3

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

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

Change-Id: I7a1180a3446ba6a5aabb76fbe87113bf0e3096c6

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

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index d1dfd7d..046c991 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -2125,11 +2125,11 @@
             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);