commit fe4ae0c5b1bc3b31adc4cc2c5a0197e29e97b6bc
author Michal Karpinski <mkarpinski@google.com> Thu Jan 25 15:24:00 2018 +0000
committer Michal Karpinski <mkarpinski@google.com> Fri Jan 26 10:37:32 2018 +0000
tree be5ee1a4cb2113a220cf4a8a7fdfcb33fd1f2dd4
parent 1caef5b882111f1911fd3438fb11fbf5793a89a5

Rename RefactoredBackupManagerService to BackupManagerService

The interface will be removed in a subsequent CL, it will be
easier to deal with merge conflicts.

Test: 1) m -j RunFrameworksServicesRoboTests
      2) runtest -p com.android.server.backup frameworks-services
Bug: 65823538
Change-Id: I37c4c6758c646e1b18889ed05aa1b1d7c6129cf0

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 94a356e..f95c6f0 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -160,7 +160,7 @@
      * them from the build system somehow.
      */
     private static final String BACKUP_MANAGER_SERVICE_CLASS =
-            "com.android.server.backup.RefactoredBackupManagerService$Lifecycle";
+            "com.android.server.backup.BackupManagerService$Lifecycle";
     private static final String APPWIDGET_SERVICE_CLASS =
             "com.android.server.appwidget.AppWidgetService";
     private static final String VOICE_RECOGNITION_MANAGER_SERVICE_CLASS =